[gerald@xxxxxxxxxxxxx]

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

User: gerald
Date: 2012/01/06 10:33 AM

Log:
 Copy over revisions from the trunk:
 
   ------------------------------------------------------------------------
   r40164 | guy | 2011-12-12 16:44:22 -0800 (Mon, 12 Dec 2011) | 5 lines
   Changed paths:
      M /trunk/epan/packet.c
 
   Clamp the reported length of a packet at G_MAXINT for now, to avoid
   crashes due to having no tvbuffs for an epan_dissect_t.
 
   Fixes bug 6663 and its soon-to-be-duplicates.
   ------------------------------------------------------------------------
   r40165 | guy | 2011-12-12 16:57:09 -0800 (Mon, 12 Dec 2011) | 3 lines
   Changed paths:
      M /trunk/wiretap/5views.c
 
   Add missing check for a too-large packet, so we don't blow up trying to
   allocate a huge buffer; fixes bug 6666.
   ------------------------------------------------------------------------
   r40166 | guy | 2011-12-12 17:05:52 -0800 (Mon, 12 Dec 2011) | 3 lines
   Changed paths:
      M /trunk/wiretap/i4btrace.c
 
   Add missing check for a too-large packet, so we don't blow up trying to
   allocate a huge buffer; fixes bug 6667.
   ------------------------------------------------------------------------
   r40167 | guy | 2011-12-12 17:24:12 -0800 (Mon, 12 Dec 2011) | 5 lines
   Changed paths:
      M /trunk/wiretap/iptrace.c
 
   Add missing checks for a too-large packet, so we don't blow up trying to
   allocate a huge buffer; fixes bug 6668.
 
   Also add some other checks for invalid records.
   ------------------------------------------------------------------------
   r40168 | guy | 2011-12-12 17:49:27 -0800 (Mon, 12 Dec 2011) | 3 lines
   Changed paths:
      M /trunk/wiretap/netmon.c
 
   Add an arbitrary limit on the maximum size of the frame table, so that
   we don't crash.  Fixes bug 6669.
   ------------------------------------------------------------------------
   r40169 | guy | 2011-12-12 18:00:41 -0800 (Mon, 12 Dec 2011) | 2 lines
   Changed paths:
      M /trunk/wiretap/lanalyzer.c
 
   Check for a bogus record size.  Fixes bug 6670.
   ------------------------------------------------------------------------
   r40170 | guy | 2011-12-12 18:42:42 -0800 (Mon, 12 Dec 2011) | 3 lines
   Changed paths:
      M /trunk/wiretap/airopeek9.c
      M /trunk/wiretap/nettl.c
      M /trunk/wiretap/packetlogger.c
 
   Add missing checks for a too-large packet, so we don't blow up trying to
   allocate a huge buffer.
   ------------------------------------------------------------------------
   r40174 | guy | 2011-12-12 22:45:16 -0800 (Mon, 12 Dec 2011) | 4 lines
   Changed paths:
      M /trunk/wiretap/netmon.c
 
   Crank up the maximum frame table size to 512*2^20 packets, that being a
   small amount bigger than the maximum possible number of packets in a
   NetMon file.
   ------------------------------------------------------------------------
 
 
 Update the release notes.

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

Directory: /trunk-1.6/epan/
  Changes    Path          Action
  +25 -1     packet.c      Modified

Directory: /trunk-1.6/wiretap/
  Changes    Path              Action
  +10 -0     5views.c          Modified
  +14 -1     airopeek9.c       Modified
  +10 -0     i4btrace.c        Modified
  +64 -2     iptrace.c         Modified
  +10 -0     lanalyzer.c       Modified
  +20 -0     netmon.c          Modified
  +11 -0     nettl.c           Modified
  +10 -0     packetlogger.c    Modified