diff options
| author | Anders Broman <anders.broman@ericsson.com> | 2011-04-04 05:48:06 +0000 |
|---|---|---|
| committer | Anders Broman <anders.broman@ericsson.com> | 2011-04-04 05:48:06 +0000 |
| commit | 6cef8aa872aeb5fb8ab2c544c5bbed4fd445802d (patch) | |
| tree | c3b5c9435876e58a3e2938a9ed9a24464864a9c8 /epan/tvbuff.c | |
| parent | f3af25f2707f25446a89b3b9d172766adead543a (diff) | |
From jakub Zawadzki:
I've fixed composite tests #0 and #2
svn path=/trunk/; revision=36440
Diffstat (limited to 'epan/tvbuff.c')
| -rw-r--r-- | epan/tvbuff.c | 2 |
1 files changed, 2 insertions, 0 deletions
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++; } |