[gerald@xxxxxxxxxxxxx]

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

User: gerald
Date: 2012/03/26 12:30 PM

Log:
 Copy over revisions from the trunk:
 
   ------------------------------------------------------------------------
   r41718 | alagoutte | 2012-03-21 02:49:35 -0700 (Wed, 21 Mar 2012) | 5 lines
   Changed paths:
      M /trunk/epan/dissectors/packet-isakmp.c
 
   From me via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6972
   ISAKMP : VendorID CheckPoint : Malformed Packet
 
   Wrong minimum length when there is not CheckPoint "Data" after VendorID
   ------------------------------------------------------------------------
   r41734 | cmaynard | 2012-03-21 20:41:58 -0700 (Wed, 21 Mar 2012) | 2 lines
   Changed paths:
      M /trunk/epan/dissectors/packet-udp.c
 
   If the checksum is 0, then only report "no checksum" for UDP/IPv4.  This patch is from Jaap Keuter via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6232
   ------------------------------------------------------------------------
 
 
 Copy over r41057 from trunk-1.6:
 
   ------------------------------------------------------------------------
   r41057 | guy | 2012-02-17 16:01:02 -0800 (Fri, 17 Feb 2012) | 10 lines
   Changed paths:
      M /trunk-1.6/epan/dissectors/packet-mp2t.c
 
   Don't trust the pointer value in a packet; it could be invalid, and this
   could cause an unsigned length value to be reduced by more than its
   value, turning it into a very large value.
 
   This is, in effect, a backport of r41001 and r41002 to 1.6, although the
   code path is different enough that it had to be done by hand.  I don't
   know whether bug 6833 would show up in 1.6, but, in any case, clearly
   setting remaining_length to a negative number Would Be Wrong, so let's
   not do that.
   ------------------------------------------------------------------------
 
 Copy over with manual intervention:
 
   ------------------------------------------------------------------------
   r41153 | guy | 2012-02-23 02:12:51 -0800 (Thu, 23 Feb 2012) | 39 lines
   Changed paths:
      M /trunk-1.6/wiretap/pcapng.c
 
   Copy over revisions from the trunk, with manual intervention:
 
     ------------------------------------------------------------------------
     r41152 | guy | 2012-02-23 02:03:16 -0800 (Thu, 23 Feb 2012) | 10 lines
 
     Do a check of the block total length in pcapng_read_unknown_block().
 
     That means we don't need to do the block length check in
     pcapng_read_block(); each block type reader, including the one for
     unknown block types, does a check that's as stringent as that block
     length check or more stringent, which means any block whose length is
     less than the minimum will fail with the same error in both cases.
 
     Fix the message for a too-short NRB.
 
     ------------------------------------------------------------------------
     r41145 | guy | 2012-02-22 15:44:25 -0800 (Wed, 22 Feb 2012) | 2 lines
 
     Fix typo introduced by previous checkin.
 
     ------------------------------------------------------------------------
     r41143 | guy | 2012-02-22 10:32:43 -0800 (Wed, 22 Feb 2012) | 16 lines
 
     Add sanity checks to make sure the claimed block size is big enough to:
 
   	1) contain the block length fields and block type field;
 
   	2) contain that plus the fixed-length portion of the block;
 
   	3) for blocks that have a variable-length portion other than the
   	   options, contain that variable-length portion.
 
     Fixes a crash we're seeing with a bad pcap-NG file in the Wireshark
     menagerie (7799-lastPacketWithoutComment.pcapng - the last packet's
     block length is 128, but it claims to have 98 bytes of packet data,
     which requires a 132-byte block).
 
     Clean up white space (use 8-space tabs).
 
   ------------------------------------------------------------------------
   r41272 | morriss | 2012-03-01 08:42:49 -0800 (Thu, 01 Mar 2012) | 4 lines
   Changed paths:
      M /trunk/ui/gtk/dfilter_expr_dlg.c
 
   Fix https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6891 :
 
   Handle generating selected values for hf's with BASE_DEC_HEX and BASE_HEX_DEC.
   ------------------------------------------------------------------------
   r41348 | guy | 2012-03-04 23:18:13 -0800 (Sun, 04 Mar 2012) | 6 lines
   Changed paths:
      M /trunk-1.6/dumpcap.c
 
   Don't try to write an interface statistics block if we're capturing from
   a pipe - we don't have a pcap_t from which to get the statistics in that
   case.
 
   Fixes bug 5939.
   ------------------------------------------------------------------------
 
 
 Update the release notes.

Directory: /trunk-1.4/epan/dissectors/
  Changes    Path               Action
  +1 -1      packet-isakmp.c    Modified
  +1 -1      packet-udp.c       Modified

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

Directory: /trunk-1.4/gtk/
  Changes    Path                  Action
  +2 -0      dfilter_expr_dlg.c    Modified

Directory: /trunk-1.4/
  Changes    Path          Action
  +2 -1      dumpcap.c     Modified

Directory: /trunk-1.4/wiretap/
  Changes    Path          Action
  +170 -26   pcapng.c      Modified