diff options
| author | Jeff Morriss <jeff.morriss.ws@gmail.com> | 2012-12-16 16:40:36 +0000 |
|---|---|---|
| committer | Jeff Morriss <jeff.morriss.ws@gmail.com> | 2012-12-16 16:40:36 +0000 |
| commit | 142aaa9c5b4f446d769792f5d2b6ef25ee71f96f (patch) | |
| tree | 1bcf1bd605eb39a49509206f835a9e2e35624392 | |
| parent | 18538f6c8a907c9b2a9b3ee0f607bcb23fbe28cf (diff) | |
Another part of the fix for https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8097 :
Don't try to add a zero-length TVB to a composite TVB.
svn path=/trunk/; revision=46565
| -rw-r--r-- | epan/dissectors/packet-bootp.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/epan/dissectors/packet-bootp.c b/epan/dissectors/packet-bootp.c index c80f2e9384..8c68ac81d3 100644 --- a/epan/dissectors/packet-bootp.c +++ b/epan/dissectors/packet-bootp.c @@ -2225,7 +2225,8 @@ bootp_option(tvbuff_t *tvb, packet_info *pinfo, proto_tree *bp_tree, int voff, } /* Concatenate the block before being interpreted for managing RFC 3396 */ - tvb_composite_append(rfc3396_dns_domain_search_list.tvb_composite, tvb_new_subset(tvb, optoff, optlen, optlen)); + if (optlen) + tvb_composite_append(rfc3396_dns_domain_search_list.tvb_composite, tvb_new_subset(tvb, optoff, optlen, optlen)); if (rfc3396_dns_domain_search_list.index_current_block == rfc3396_dns_domain_search_list.total_number_of_block) { /* Here, we are into the last (or unique) option 119. */ |