summaryrefslogtreecommitdiff
path: root/epan/dissectors/packet-amqp.c
diff options
context:
space:
mode:
Diffstat (limited to 'epan/dissectors/packet-amqp.c')
-rw-r--r--epan/dissectors/packet-amqp.c8
1 files changed, 7 insertions, 1 deletions
diff --git a/epan/dissectors/packet-amqp.c b/epan/dissectors/packet-amqp.c
index 44899370a6..303bd3bbd2 100644
--- a/epan/dissectors/packet-amqp.c
+++ b/epan/dissectors/packet-amqp.c
@@ -9978,7 +9978,13 @@ get_amqp_1_0_value_formatter(tvbuff_t *tvb,
item,
hf_amqp_type,
hf_amqp_subtype_count,
- hf_amqp_subtypes, name)-1; /* "-1" due to decode type again in the method */
+ hf_amqp_subtypes, name);
+ if (*length_size == 0) {
+ /* something went wrong during list dissection; let's stop here */
+ *length_size = tvb_reported_length_remaining(tvb, offset);
+ } else {
+ *length_size -= 1; /* "-1" due to decode type again in the method */
+ }
break;
case AMQP_1_0_TYPE_MAP8:
case AMQP_1_0_TYPE_MAP32: