http://anonsvn.wireshark.org/viewvc/viewvc.cgi?view=rev&revision=49732
User: gerald
Date: 2013/06/03 03:25 PM
Log:
Copy over revisions from the trunk:
------------------------------------------------------------------------
r49722 | pascal | 2013-06-03 10:55:20 -0700 (Mon, 03 Jun 2013) | 3 lines
Changed paths:
M /trunk/epan/dissectors/packet-imap.c
Fix https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8739 :
Move offset to end of line without assuming that we always have \r\n at the end of it
------------------------------------------------------------------------
r49644 | morriss | 2013-05-30 18:46:28 -0700 (Thu, 30 May 2013) | 14 lines
Changed paths:
M /trunk/epan/proto.c
(Finally!) check in part of Didier's patch to fix
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=3290
(TRY_TO_FAKE_THIS_ITEM disables bounds errors):
Before calling TRY_TO_FAKE_THIS_ITEM() check if the length given (or, in
the case of FT_UINT_{STRING,BYTES}, the length we retrieve from the TVB)
exceeds what's left in the TVB.
Do this only for proto_tree_add_item() for now (it's the most commonly used
and thus the biggest trouble maker in this area).
Similar changes for other APIs will come later (if nothing blows up). Despite
the fuzz failures this bug has caused I'm not sure about back-porting it...
------------------------------------------------------------------------
r49652 | eapache | 2013-05-31 06:08:03 -0700 (Fri, 31 May 2013) | 5 lines
Changed paths:
M /trunk/epan/proto.c
Fix the integer overflow case Jakub caught in
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=3290#c26
Also use indentation consistent with the rest of the file.
------------------------------------------------------------------------
Directory: /trunk-1.10/epan/dissectors/
Changes Path Action
+1 -1 packet-imap.c Modified
Directory: /trunk-1.10/epan/
Changes Path Action
+38 -3 proto.c Modified