osmocom
/
wireshark
14
0
Fork 1
Code Issues Pull Requests Projects Releases Wiki Activity

As suggested by Evan in https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8097 : 

Put r46564 back in as the computation of member_length is non-trivial.

svn path=/trunk/; revision=46567
This commit is contained in:
Jeff Morriss 2012-12-16 18:23:10 +00:00
parent c6c5c3d978
commit 306821bf6e
1 changed files with 3 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
epan/tvbuff.c
View File

@ -1057,6 +1057,9 @@ composite_memcpy(tvbuff_t *tvb, guint8* target, guint abs_offset, size_t abs_len
&member_offset, &member_length, NULL);
DISSECTOR_ASSERT(retval);
/* composite_memcpy() can't handle a member_length of zero. */
DISSECTOR_ASSERT(member_length);
tvb_memcpy(member_tvb, target, member_offset, member_length);
abs_offset += member_length;
abs_length -= member_length;