Page MenuHomeFreeBSD

D52535.id162028.diff
No OneTemporary

D52535.id162028.diff

diff --git a/lib/libsysdecode/utrace.c b/lib/libsysdecode/utrace.c
--- a/lib/libsysdecode/utrace.c
+++ b/lib/libsysdecode/utrace.c
@@ -169,7 +169,8 @@
struct utrace_malloc um;
struct utrace_malloc32 *pm;
#endif
- static const char rtld_utrace_sig[RTLD_UTRACE_SIG_SZ] = RTLD_UTRACE_SIG;
+ __nonstring static const char rtld_utrace_sig[RTLD_UTRACE_SIG_SZ] =
+ RTLD_UTRACE_SIG;
if (len == sizeof(struct utrace_rtld) && bcmp(p, rtld_utrace_sig,
sizeof(rtld_utrace_sig)) == 0)
diff --git a/libexec/rtld-elf/rtld_utrace.h b/libexec/rtld-elf/rtld_utrace.h
--- a/libexec/rtld-elf/rtld_utrace.h
+++ b/libexec/rtld-elf/rtld_utrace.h
@@ -49,7 +49,7 @@
#define RTLD_UTRACE_SIG "RTLD"
struct utrace_rtld {
- char sig[RTLD_UTRACE_SIG_SZ];
+ __nonstring char sig[RTLD_UTRACE_SIG_SZ];
int event;
void *handle;
void *mapbase; /* Used for 'parent' and 'init/fini' */
diff --git a/sys/sys/cdefs.h b/sys/sys/cdefs.h
--- a/sys/sys/cdefs.h
+++ b/sys/sys/cdefs.h
@@ -394,6 +394,13 @@
#define __printf0like(fmtarg, firstvararg)
#endif
+/* To silence warnings about null terminator not fitting into an array. */
+#if __has_attribute(__nonstring__)
+#define __nonstring __attribute__((__nonstring__))
+#else
+#define __nonstring
+#endif
+
#define __strong_reference(sym,aliassym) \
extern __typeof (sym) aliassym __attribute__ ((__alias__ (#sym)))
#ifdef __STDC__

File Metadata

Mime Type
text/plain
Expires
Mon, Feb 9, 4:28 AM (4 h, 41 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
28537083
Default Alt Text
D52535.id162028.diff (1 KB)

Event Timeline