summaryrefslogtreecommitdiff
path: root/epan/dissectors/packet-atn-cm.c
diff options
context:
space:
mode:
authorEvan Huus <eapache@gmail.com>2014-05-25 11:13:04 -0400
committerEvan Huus <eapache@gmail.com>2014-05-25 18:12:00 +0000
commit08ce84ebbe91eaaccd8bbf8c8d43c8cecfc7945a (patch)
tree1ee03c6b55a52e996fbf1ec25befe127cb071385 /epan/dissectors/packet-atn-cm.c
parentc4ead251da7199cfd746d378c51eb8c30d09a6ba (diff)
downloadwireshark-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-atn-cm.c')
-rw-r--r--epan/dissectors/packet-atn-cm.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/epan/dissectors/packet-atn-cm.c b/epan/dissectors/packet-atn-cm.c
index e7ca5a1278..d7fd33dd6c 100644
--- a/epan/dissectors/packet-atn-cm.c
+++ b/epan/dissectors/packet-atn-cm.c
@@ -641,9 +641,9 @@ dissect_atn_cm(
proto_tree *tree,
void *data _U_)
{
- int type = no_msg;
- proto_item *ti = NULL;
- proto_tree *sub_tree = NULL;
+ int type;
+ proto_item *ti;
+ proto_tree *sub_tree;
ti = proto_tree_add_text(
tree,