diff options
| author | Stig Bjørlykke <stig@bjorlykke.org> | 2010-01-25 13:58:07 +0000 |
|---|---|---|
| committer | Stig Bjørlykke <stig@bjorlykke.org> | 2010-01-25 13:58:07 +0000 |
| commit | 637274ebbce866e726871373e0fc2fa022c86246 (patch) | |
| tree | 6975209bfae0590be48a9f2a62e5097e8966c357 /epan/dissectors/packet-dmp.c | |
| parent | bb5ef1c5214e21304a25f255109961eebf218e29 (diff) | |
Change back from tvb_child_uncompress() to tvb_uncompress() when
parent is NULL, because this will lead to a DISSECTOR_ASSERT in
tvb_set_child_real_data_tvbuff().
This bug was introduced in revision 31499.
svn path=/trunk/; revision=31659
Diffstat (limited to 'epan/dissectors/packet-dmp.c')
| -rw-r--r-- | epan/dissectors/packet-dmp.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/epan/dissectors/packet-dmp.c b/epan/dissectors/packet-dmp.c index df2e61cf71..0a24ccd3c5 100644 --- a/epan/dissectors/packet-dmp.c +++ b/epan/dissectors/packet-dmp.c @@ -2744,7 +2744,7 @@ static gint dissect_dmp_message (tvbuff_t *tvb, packet_info *pinfo, } else if (len > 0 && (dmp.body_format == FREE_TEXT || dmp.body_format == FREE_TEXT_SUBJECT)) { if (compr_alg == ALGORITHM_ZLIB) { - if ((next_tvb = tvb_child_uncompress (NULL, tvb, offset, len)) != NULL) { + if ((next_tvb = tvb_uncompress (tvb, offset, len)) != NULL) { gint zlen = tvb_length (next_tvb); add_new_data_source (pinfo, next_tvb, "Uncompressed User data"); tf = proto_tree_add_none_format (message_tree, |