aboutsummaryrefslogtreecommitdiffstats
path: root/epan/dissectors/packet-mq.c
diff options
context:
space:
mode:
authorgerald <gerald@f5534014-38df-0310-8fa8-9805f1628bb7>2006-07-09 22:12:02 +0000
committergerald <gerald@f5534014-38df-0310-8fa8-9805f1628bb7>2006-07-09 22:12:02 +0000
commit9f8386d63f8fc6fb2bdeed2949795f46ca9a1227 (patch)
tree55cf0cb616310c4e42a93835a86f9ecffedaad3e /epan/dissectors/packet-mq.c
parentc7f8e7a695c637e0aaf43bf7a763fb4f9f16fdfc (diff)
In new_format_oid(), handle a zero-length OID.
Fix a bug introduced recently in packet-rpc.c. Replace DISSECTOR_ASSERT() with THROW(ReportedBoundsError) in my recent checkins, since fuzz-test.sh sets WIRESHARK_ABORT_ON_DISSECTOR_BUG. git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@18693 f5534014-38df-0310-8fa8-9805f1628bb7
Diffstat (limited to 'epan/dissectors/packet-mq.c')
-rw-r--r--epan/dissectors/packet-mq.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/epan/dissectors/packet-mq.c b/epan/dissectors/packet-mq.c
index 9529b4917c..d891207dc1 100644
--- a/epan/dissectors/packet-mq.c
+++ b/epan/dissectors/packet-mq.c
@@ -2207,7 +2207,8 @@ dissect_mq_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
iSizeHeader = (gint) tvb_get_guint32_endian(tvb, offset + 8, bLittleEndian);
/* XXX - 32 is inferred from the code below. What's the
* correct minimum? */
- DISSECTOR_ASSERT(iSizeHeader > 32);
+ if (iSizeHeader <= 32)
+ THROW(ReportedBoundsError);
if (tvb_length_remaining(tvb, offset) >= iSizeHeader)
{