Wireshark-commits: [Wireshark-commits] rev 49747: /trunk-1.8/epan/dissectors/ /trunk-1.8/epan/disse
Date Index · Thread Index · Other Months · All Mailing Lists
Date Prev · Date Next · Thread Prev · Thread Next
From: morriss@xxxxxxxxxxxxx
Date: Tue, 04 Jun 2013 02:40:15 GMT
http://anonsvn.wireshark.org/viewvc/viewvc.cgi?view=rev&revision=49747

User: morriss
Date: 2013/06/03 07:40 PM

Log:
 Copy over with manual intervention:
 
   ------------------------------------------------------------------------
   r49744 | morriss | 2013-06-03 22:01:53 -0400 (Mon, 03 Jun 2013) | 10 lines
 
   Fix the fuzz failure reported (by me) in https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8764 :
 
   Apply the fix from bug 8539 (r48796) to another function (dissect_r3_upstreamcommand_queryconfig()):
 
   Bail out of the item length we get (which we use to increment the offset) is 0.
   Otherwise the offset does not advance and we loop forever.
 
   While we're in there: get the item length just once (there's no need to call
   tvb_get_guint8() a half dozen times when one will do).
 
   ------------------------------------------------------------------------
 
 Also copy over part of r43663: replace a DISSECTOR_ASSERT() with an expert info.

Directory: /trunk-1.8/epan/dissectors/
  Changes    Path                Action
  +16 -8     packet-assa_r3.c    Modified