Wireshark · Wireshark-commits: [Wireshark-commits] rev 46571: /trunk-1.8/epan/ /trunk-1.8/epan/: tvbuff.c

[morriss@xxxxxxxxxxxxx]

http://anonsvn.wireshark.org/viewvc/viewvc.cgi?view=rev&revision=46571

User: morriss
Date: 2012/12/16 12:06 PM

Log:
 As suggested by Evan, manually copy over:
 
   ------------------------------------------------------------------------
   r46570 | morriss | 2012-12-16 14:26:12 -0500 (Sun, 16 Dec 2012) | 6 lines
 
   Another composite-TVB fix inspired by
   https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8097 :
 
   Assert out if tvb_composite_finalize() is called on a composite TVB with
   no members (sub-TVBs).
 
   ------------------------------------------------------------------------
   r46567 | morriss | 2012-12-16 13:23:10 -0500 (Sun, 16 Dec 2012) | 4 lines
 
   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.
 
   ------------------------------------------------------------------------
   r46566 | morriss | 2012-12-16 11:49:52 -0500 (Sun, 16 Dec 2012) | 5 lines
 
   A different fix for https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8097 :
 
   Rather than asserting out when we find a zero-length TVB in a composite TVB,
   assert out when a dissector adds a zero-length TVB to a composite.
 
   ------------------------------------------------------------------------
   r46564 | eapache | 2012-12-16 11:21:41 -0500 (Sun, 16 Dec 2012) | 6 lines
 
   DISSECTOR_ASSERT on member_length when composing a disjoint tvb in order to
   avoid an infinite recursion. More robust handling of the error case in
   https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8097
   but doesn't fix the actual bug (which is that either DHCP or BOOTP is building
   an invalid tvbuff).

Directory: /trunk-1.8/epan/
  Changes    Path          Action
  +21 -0     tvbuff.c      Modified