diff options
| author | Peter Wu <peter@lekensteyn.nl> | 2014-07-06 15:34:38 +0200 |
|---|---|---|
| committer | Evan Huus <eapache@gmail.com> | 2014-07-06 23:00:40 +0000 |
| commit | f2b4daf4005d60eef7e34e2e6ebf4fe487d3c255 (patch) | |
| tree | 1fac15d7bcbc381c5e0a3a6602e7edd20e574e39 /epan/dissectors/packet-dis.c | |
| parent | ec6a22dc3ba8e2d438b34d892d6a40e1be2a28f2 (diff) | |
| download | wireshark-f2b4daf4005d60eef7e34e2e6ebf4fe487d3c255.tar.gz | |
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/dissectors/packet-dis.c')
| -rw-r--r-- | epan/dissectors/packet-dis.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/epan/dissectors/packet-dis.c b/epan/dissectors/packet-dis.c index 2e1aa051b1..4a9723eed2 100644 --- a/epan/dissectors/packet-dis.c +++ b/epan/dissectors/packet-dis.c @@ -5125,7 +5125,7 @@ static int dissect_DIS_PARSER_SIGNAL_PDU(tvbuff_t *tvb, packet_info *pinfo, prot offset = parse_DIS_FIELDS_SIGNAL_LINK16_NETWORK_HEADER(tvb, tree, offset, &messageType); ti = proto_tree_add_text(tree, tvb, offset, -1, "Link 16 Message Data: %s", - val_to_str(messageType, DIS_PDU_Link16_MessageType_Strings, "")); + val_to_str_const(messageType, DIS_PDU_Link16_MessageType_Strings, "")); sub_tree = proto_item_add_subtree(ti, ett_dis_signal_link16_message_data); offset = parse_Link16_Message_Data(sub_tree, tvb, offset, pinfo, encodingScheme, messageType); proto_item_set_end(ti, tvb, offset); |