Wireshark-commits: [Wireshark-commits] rev 41578: /trunk-1.6/ /trunk-1.6/docbook/: release-notes.xm
http://anonsvn.wireshark.org/viewvc/viewvc.cgi?view=rev&revision=41578

User: gerald
Date: 2012/03/15 03:04 PM

Log:
 Copy over r41008 from the trunk with manual intervention:
 
   ------------------------------------------------------------------------
   r41008 | morriss | 2012-02-12 19:03:03 -0800 (Sun, 12 Feb 2012) | 7 lines
   Changed paths:
      M /trunk/wiretap/pcap-common.c
 
   Fix the crash reported in https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6804
 
   For WTAP_ENCAP_ERF files if we find an Extension and/or Multi-Channel header,
   ensure that the size of the full pseudoheader is smaller than the packet size
   to avoid an underflow and subsequent attempt to allocate a rather large amount
   of memory.
   ------------------------------------------------------------------------

Directory: /trunk-1.6/docbook/
  Changes    Path                 Action
  +18 -0     release-notes.xml    Modified

Directory: /trunk-1.6/wiretap/
  Changes    Path             Action
  +12 -0     pcap-common.c    Modified