http://anonsvn.wireshark.org/viewvc/viewvc.cgi?view=rev&revision=44431
User: gerald
Date: 2012/08/10 10:59 AM
Log:
Copy over r44377 with manual intervention:
------------------------------------------------------------------------
r44377 | morriss | 2012-08-09 06:20:39 -0700 (Thu, 09 Aug 2012) | 12 lines
Changed paths:
M /trunk/epan/dissectors/packet-erf.c
From Stephen Donnelly: a better fix for the fuzz failure reported in
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7563 :
Previous patch solved the reported problem. This patch should cover input
validation for the VC Id and Link Rate fields properly.
Note link_rate==0 (unknown) is supported, as some hardware/firmware may not set
this field, but vc_size==0 is defined invalid.
From me: also initialize m_sdh_line_rate when the input is garbage.
------------------------------------------------------------------------
Copy over r44419 from the trunk:
------------------------------------------------------------------------
r44419 | morriss | 2012-08-10 06:00:20 -0700 (Fri, 10 Aug 2012) | 4 lines
Changed paths:
M /trunk/epan/dissectors/packet-erf.c
From Stephen Donnelly via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7563 :
Remove another invalid array write.
------------------------------------------------------------------------
Update the release notes.
Directory: /trunk-1.8/epan/dissectors/
Changes Path Action
+27 -29 packet-erf.c Modified
Directory: /trunk-1.8/docbook/
Changes Path Action
+2 -2 release-notes.xml Modified