diff options
| author | Jeff Morriss <jeff.morriss.ws@gmail.com> | 2012-12-16 18:23:10 +0000 |
|---|---|---|
| committer | Jeff Morriss <jeff.morriss.ws@gmail.com> | 2012-12-16 18:23:10 +0000 |
| commit | 306821bf6e7b8eee5450ca06b223eb647d213c13 (patch) | |
| tree | ecce598bec6258836a11877d5d7c8596d8440845 | |
| parent | c6c5c3d9789b6bb65386ff81d885b285f455bb24 (diff) | |
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
| -rw-r--r-- | epan/tvbuff.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/epan/tvbuff.c b/epan/tvbuff.c index 0cf5811339..d7dccb755a 100644 --- a/epan/tvbuff.c +++ b/epan/tvbuff.c @@ -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; |