diff options
author | Evan Huus <eapache@gmail.com> | 2014-05-25 11:13:04 -0400 |
---|---|---|
committer | Evan Huus <eapache@gmail.com> | 2014-05-25 18:12:00 +0000 |
commit | 08ce84ebbe91eaaccd8bbf8c8d43c8cecfc7945a (patch) | |
tree | 1ee03c6b55a52e996fbf1ec25befe127cb071385 /epan/dissectors/packet-batadv.c | |
parent | c4ead251da7199cfd746d378c51eb8c30d09a6ba (diff) | |
download | wireshark-08ce84ebbe91eaaccd8bbf8c8d43c8cecfc7945a.tar.gz |
Grab-bag of dead initializers and two actual bugs.
All caught by cppcheck. The two (semi)-interesting bugs are:
- in asn1/atn-cpdlc/packet-atn-cpdlc-template.c where the break statement should
have been inside the brace, causing potential control-flow weirdness with
exceptions
- in epan/dissectors/packet-ieee80211.c where the bounds check for tag_len did
not match the expert info given
Change-Id: Ie173fb8d917aabb9b4571435d671d6f16e1c7569
Reviewed-on: https://code.wireshark.org/review/1793
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Reviewed-by: Evan Huus <eapache@gmail.com>
Diffstat (limited to 'epan/dissectors/packet-batadv.c')
-rw-r--r-- | epan/dissectors/packet-batadv.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/epan/dissectors/packet-batadv.c b/epan/dissectors/packet-batadv.c index 3dae4aef9c..1a52fc45d5 100644 --- a/epan/dissectors/packet-batadv.c +++ b/epan/dissectors/packet-batadv.c @@ -2238,7 +2238,7 @@ static void dissect_batadv_unicast_frag_v12(tvbuff_t *tvb, packet_info *pinfo, p proto_item *tf; struct unicast_frag_packet_v12 *unicast_frag_packeth; const guint8 *dest_addr, *orig_addr; - gboolean save_fragmented = FALSE; + gboolean save_fragmented; fragment_head *frag_msg = NULL; proto_tree *batadv_unicast_frag_tree = NULL, *flag_tree; @@ -2344,7 +2344,7 @@ static void dissect_batadv_unicast_frag_v14(tvbuff_t *tvb, packet_info *pinfo, p proto_item *tf; struct unicast_frag_packet_v14 *unicast_frag_packeth; const guint8 *dest_addr, *orig_addr; - gboolean save_fragmented = FALSE; + gboolean save_fragmented; fragment_head *frag_msg = NULL; proto_tree *batadv_unicast_frag_tree = NULL, *flag_tree; |