aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAnders Broman <anders.broman@ericsson.com>2011-06-05 20:12:44 +0000
committerAnders Broman <anders.broman@ericsson.com>2011-06-05 20:12:44 +0000
commit2477298026d8d24ba3e3fa956b602261300e178a (patch)
treec7cfff786f3009fab596bef81e4f03a02d9e2e7a
parent70f488cea7d3dd52798e40f2a7df6b27e7f9025b (diff)
downloadwireshark-2477298026d8d24ba3e3fa956b602261300e178a.tar.gz
wireshark-2477298026d8d24ba3e3fa956b602261300e178a.tar.bz2
wireshark-2477298026d8d24ba3e3fa956b602261300e178a.zip
From Sean Van Gorder:
When Wireshark attempts to read an SNMP packet with a variable-bindings item with an OID containing an index string which includes an entry of type "Unsigned32", Wireshark will stop dissecting the packet at this index entry and end with the error: [Dissector bug, protocol SNMP: proto.c:2761: failed assertion "DISSECTOR_ASSERT_NOT_REACHED"] https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5883 svn path=/trunk/; revision=37558
-rw-r--r--asn1/snmp/packet-snmp-template.c2
-rw-r--r--epan/dissectors/packet-snmp.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/asn1/snmp/packet-snmp-template.c b/asn1/snmp/packet-snmp-template.c
index 959008cfb5..9d3746ff16 100644
--- a/asn1/snmp/packet-snmp-template.c
+++ b/asn1/snmp/packet-snmp-template.c
@@ -588,7 +588,7 @@ dissect_snmp_VarBind(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset,
if (IS_FT_INT(k->ft_type)) {
proto_tree_add_int(pt_name,k->hfid,tvb,name_offset,name_len,(guint)subids[key_start]);
} else { /* if it's not an unsigned int let proto_tree_add_uint throw a warning */
- proto_tree_add_uint(pt_name,k->hfid,tvb,name_offset,name_len,(guint)subids[key_start]);
+ proto_tree_add_uint64(pt_name,k->hfid,tvb,name_offset,name_len,(guint)subids[key_start]);
}
key_start++;
key_len--;
diff --git a/epan/dissectors/packet-snmp.c b/epan/dissectors/packet-snmp.c
index 5228412794..84d0754b66 100644
--- a/epan/dissectors/packet-snmp.c
+++ b/epan/dissectors/packet-snmp.c
@@ -690,7 +690,7 @@ dissect_snmp_VarBind(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset,
if (IS_FT_INT(k->ft_type)) {
proto_tree_add_int(pt_name,k->hfid,tvb,name_offset,name_len,(guint)subids[key_start]);
} else { /* if it's not an unsigned int let proto_tree_add_uint throw a warning */
- proto_tree_add_uint(pt_name,k->hfid,tvb,name_offset,name_len,(guint)subids[key_start]);
+ proto_tree_add_uint64(pt_name,k->hfid,tvb,name_offset,name_len,(guint)subids[key_start]);
}
key_start++;
key_len--;