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-ldss.c | |
| parent | bb5ef1c5214e21304a25f255109961eebf218e29 (diff) | |
| download | wireshark-637274ebbce866e726871373e0fc2fa022c86246.tar.gz | |
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-ldss.c')
| -rw-r--r-- | epan/dissectors/packet-ldss.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/epan/dissectors/packet-ldss.c b/epan/dissectors/packet-ldss.c index 05996b7fc9..bf5e63a334 100644 --- a/epan/dissectors/packet-ldss.c +++ b/epan/dissectors/packet-ldss.c @@ -701,7 +701,7 @@ dissect_ldss_transfer (tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) /* Be nice and uncompress the file data. */ if (compression == COMPRESSION_GZIP) { tvbuff_t *uncomp_tvb = NULL; - uncomp_tvb = tvb_child_uncompress(NULL, tvb, 0, tvb_length(tvb)); + uncomp_tvb = tvb_uncompress(tvb, 0, tvb_length(tvb)); if (uncomp_tvb != NULL) { ti = proto_tree_add_bytes_format_value(ldss_tree, hf_ldss_file_data, uncomp_tvb, 0, tvb_length(uncomp_tvb), |