[gerald@xxxxxxxxxxxxx]

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

User: gerald
Date: 2013/07/17 03:20 PM

Log:
 Copy over revisions from the trunk:
 
   ------------------------------------------------------------------------
   r50228 | mmann | 2013-06-28 19:54:58 -0700 (Fri, 28 Jun 2013) | 11 lines
   Changed paths:
      M /trunk/epan/dissectors/packet-kdsp.c
 
   Improvements for the KDSP dissector.  Bug 8864 (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8864)
 
   From Yuri Schaeffer
 
   It addresses the following issues:
 
   - Payload was included for all CAPPACKET messages. Even when not flagged by bitmap (bug).
   - Frame Checksum (FCS) was not read from bitmap all following data is off by 4. (bug)
   - Headers indicated in bitmap could use own subtree
   - Payload is malformed because it is assumed the span 'the rest of the packet'. In reality more commands can follow. (bug)
   ------------------------------------------------------------------------
   r50230 | mmann | 2013-06-29 12:59:08 -0700 (Sat, 29 Jun 2013) | 1 line
   Changed paths:
      M /trunk/epan/dissectors/packet-ip.c
      M /trunk/epan/dissectors/packet-ppp.c
      M /trunk/epan/dissectors/packet-tcp.c
      M /trunk/epan/ip_opts.h
 
   Separate IP option header fields for each dissector that uses dissect_ip_tcp_options().  Bug 8823 (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8823)
   ------------------------------------------------------------------------
   r50282 | cmaynard | 2013-06-30 22:23:17 -0700 (Sun, 30 Jun 2013) | 4 lines
   Changed paths:
      M /trunk/epan/tvbuff.c
 
   There are a few dissectors that pass the return value of tvb_length_remaining() as the size argument to the tvb_format_*() functions.  Try to do something sane if that value happens to be -1 (or negative in general).  One such example is packet-bthfp.c, as found and reported by Coverity in CID 1035325 (Improper use of negative value).
 
   Note: There are other ways to handle this of course, but this fix is suitable for backporting to both 1.10 and 1.8, as it does not break binary compatibility.  Is there a better way to fix this though?  For now, schedule this for backport.
   ------------------------------------------------------------------------
   r50301 | cmaynard | 2013-07-01 09:29:17 -0700 (Mon, 01 Jul 2013) | 3 lines
   Changed paths:
      M /trunk/plugins/profinet/packet-dcerpc-pn-io.c
 
   Fix Coverity CID 1035326 (Improper use of negative value) by guarding against tvb_reported_length_remaining() possibly returning -1.
   #BACKPORT(1.10,1.8)
   ------------------------------------------------------------------------
   r50303 | cmaynard | 2013-07-01 12:52:32 -0700 (Mon, 01 Jul 2013) | 3 lines
   Changed paths:
      M /trunk/ws80211_utils.c
 
   Fix Coverity CID 997052 (Infinite loop) by declaring 'err' volatile.
   #BACKPORT(1.10)
   ------------------------------------------------------------------------
   r50306 | cmaynard | 2013-07-01 13:38:12 -0700 (Mon, 01 Jul 2013) | 2 lines
   Changed paths:
      M /trunk/ws80211_utils.c
 
   Add some casts to try to appease the Ubuntu buildbot, which is angry from  r50303.
   ------------------------------------------------------------------------
   r50305 | cmaynard | 2013-07-01 13:25:49 -0700 (Mon, 01 Jul 2013) | 3 lines
   Changed paths:
      M /trunk/plugins/asn1/packet-asn1.c
 
   Fix Coverity CID 280618 (Dereference before null check).
   #BACKPORT(1.10,1.8)
   ------------------------------------------------------------------------
   r50313 | mmann | 2013-07-02 09:02:31 -0700 (Tue, 02 Jul 2013) | 1 line
   Changed paths:
      M /trunk/epan/expert.c
 
   Cache the malformed filter instead of looking it up each time a malformed packet comes in.  This drastically speeds up the load time of captures with lots of malformed packets (ie fuzztesting).
   ------------------------------------------------------------------------
 
 Update the release notes.

Directory: /trunk-1.10/plugins/asn1/
  Changes    Path             Action
  +2 -2      packet-asn1.c    Modified

Directory: /trunk-1.10/epan/dissectors/
  Changes    Path                    Action
  +44 -0     packet-dcerpc-ndr.c     Modified
  +107 -24   packet-dcom-sysact.c    Modified
  +1 -1      packet-imap.c           Modified
  +28 -29    packet-ip.c             Modified
  +105 -31   packet-kdsp.c           Modified
  +3 -3      packet-lisp.c           Modified
  +93 -38    packet-mpls-echo.c      Modified
  +1 -0      packet-nfs.c            Modified
  +29 -8     packet-ppp.c            Modified
  +26 -1     packet-tcp.c            Modified


(11 files not shown)