diff options
| author | Gerald Combs <gerald@wireshark.org> | 2006-07-09 22:12:02 +0000 |
|---|---|---|
| committer | Gerald Combs <gerald@wireshark.org> | 2006-07-09 22:12:02 +0000 |
| commit | 8b315480f1df953751fda12c58ed891862e03edc (patch) | |
| tree | 55cf0cb616310c4e42a93835a86f9ecffedaad3e /epan/dissectors/packet-mq.c | |
| parent | 6dd2196da600c33b59572c1571f4f7dc3225c870 (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.
svn path=/trunk/; revision=18693
Diffstat (limited to 'epan/dissectors/packet-mq.c')
| -rw-r--r-- | epan/dissectors/packet-mq.c | 3 |
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) { |