aboutsummaryrefslogtreecommitdiffstats
path: root/epan/emem.h
diff options
context:
space:
mode:
authorPeter Wu <peter@lekensteyn.nl>2014-07-06 15:34:38 +0200
committerEvan Huus <eapache@gmail.com>2014-07-06 23:00:40 +0000
commitf2b4daf4005d60eef7e34e2e6ebf4fe487d3c255 (patch)
tree1fac15d7bcbc381c5e0a3a6602e7edd20e574e39 /epan/emem.h
parentec6a22dc3ba8e2d438b34d892d6a40e1be2a28f2 (diff)
downloadwireshark-f2b4daf4005d60eef7e34e2e6ebf4fe487d3c255.tar.gz
wireshark-f2b4daf4005d60eef7e34e2e6ebf4fe487d3c255.tar.bz2
wireshark-f2b4daf4005d60eef7e34e2e6ebf4fe487d3c255.zip
Add printf-format annotations, fix garbage
The WRETH dissector showed up some garbage in the column display. Upon further inspection, it turns out that the format string had a trailing percent sign which caused (unsigned)-1 to be returned by g_printf_string_upper_bound (in emem_strdup_vprintf). Then ep_alloc is called with (unsigned)-1 + 1 = 0 memory, no wonder that garbage shows up. ASAN could not even catch this error because EP is in charge of this. So, start adding G_GNUC_PRINTF annotations in each header that uses the "fmt" or "format" paramters (grepped + awk). This revealed some other errors. The NCP2222 dissector was missing a format string (not a security vuln though). Many dissectors used val_to_str with a constant (but empty) string, these have been replaced by val_to_str_const. ASN.1 dissectors were regenerated for this. Minor: the mate plugin used "%X" instead of "%p" for a pointer type. The ncp2222 dissector and wimax plugin gained modelines. Change-Id: I7f3f6a3136116f9b251719830a39a7b21646f622 Reviewed-on: https://code.wireshark.org/review/2881 Reviewed-by: Evan Huus <eapache@gmail.com>
Diffstat (limited to 'epan/emem.h')
-rw-r--r--epan/emem.h5
1 files changed, 3 insertions, 2 deletions
diff --git a/epan/emem.h b/epan/emem.h
index 0ce3b20478..0e41294a61 100644
--- a/epan/emem.h
+++ b/epan/emem.h
@@ -75,10 +75,11 @@ void* ep_memdup(const void* src, size_t len) G_GNUC_MALLOC;
/** Create a formatted string with a packet lifetime scope */
WS_DLL_PUBLIC
-gchar* ep_strdup_vprintf(const gchar* fmt, va_list ap) G_GNUC_MALLOC;
+gchar* ep_strdup_vprintf(const gchar* fmt, va_list ap)
+ G_GNUC_MALLOC G_GNUC_PRINTF(1, 0);
WS_DLL_PUBLIC
gchar* ep_strdup_printf(const gchar* fmt, ...)
- G_GNUC_MALLOC G_GNUC_PRINTF(1, 2);
+ G_GNUC_MALLOC G_GNUC_PRINTF(1, 2);
WS_DLL_PUBLIC
gchar *ep_strconcat(const gchar *string, ...) G_GNUC_MALLOC G_GNUC_NULL_TERMINATED;