osmith
/
wireshark
forked from osmocom/wireshark
1
0
Fork 0
Code Pull Requests Releases Wiki Activity

Apply r46565 to another spot. 

svn path=/trunk/; revision=46568
This commit is contained in:
Jeff Morriss 2012-12-16 18:32:50 +00:00
parent 306821bf6e
commit 72f5595125
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
epan/dissectors/packet-bootp.c
View File

@ -2271,7 +2271,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_sip_server.tvb_composite, tvb_new_subset(tvb, optoff, optlen, optlen));
if (optlen)
tvb_composite_append(rfc3396_sip_server.tvb_composite, tvb_new_subset(tvb, optoff, optlen, optlen));
if (rfc3396_sip_server.index_current_block == rfc3396_sip_server.total_number_of_block) {
/* Here, we are into the last (or unique) option 120. */