From 6cef8aa872aeb5fb8ab2c544c5bbed4fd445802d Mon Sep 17 00:00:00 2001 From: Anders Broman Date: Mon, 4 Apr 2011 05:48:06 +0000 Subject: From jakub Zawadzki: I've fixed composite tests #0 and #2 svn path=/trunk/; revision=36440 --- epan/tvbuff.c | 2 ++ 1 file changed, 2 insertions(+) (limited to 'epan/tvbuff.c') diff --git a/epan/tvbuff.c b/epan/tvbuff.c index 32f8225868..57b9580304 100644 --- a/epan/tvbuff.c +++ b/epan/tvbuff.c @@ -604,6 +604,7 @@ tvb_composite_finalize(tvbuff_t* tvb) DISSECTOR_ASSERT(tvb && !tvb->initialized); DISSECTOR_ASSERT(tvb->type == TVBUFF_COMPOSITE); DISSECTOR_ASSERT(tvb->length == 0); + DISSECTOR_ASSERT(tvb->reported_length == 0); composite = &tvb->tvbuffs.composite; num_members = g_slist_length(composite->tvbs); @@ -616,6 +617,7 @@ tvb_composite_finalize(tvbuff_t* tvb) member_tvb = slist->data; composite->start_offsets[i] = tvb->length; tvb->length += member_tvb->length; + tvb->reported_length += member_tvb->reported_length; composite->end_offsets[i] = tvb->length - 1; i++; } -- cgit v1.2.3