[gerald@xxxxxxxxxxxxx]

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

User: gerald
Date: 2013/07/24 09:54 AM

Log:
 Copy over revisions from the trunk:
 
   ------------------------------------------------------------------------
   r43997 | wmeier | 2012-07-25 08:04:19 -0700 (Wed, 25 Jul 2012) | 4 lines
   Changed paths:
      M /trunk/epan/dissectors/packet-kdsp.c
 
   Minor cleanup:
   - Remove some unneeded initializers & casts;
   - whitespace.
   ------------------------------------------------------------------------
   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)
   ------------------------------------------------------------------------
   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)
   ------------------------------------------------------------------------
   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)
   ------------------------------------------------------------------------
 
 
 Copy over with manual intervention:
 
   ------------------------------------------------------------------------
   r50226 | eapache | 2013-06-28 16:54:53 -0700 (Fri, 28 Jun 2013) | 5 lines
   Changed paths:
      M /trunk/epan/dissectors/packet-dcerpc-ndr.c
 
   Callers to dissect_ndr_* functions expect pdata to be initialized on return from
   the function, so make sure it is even in error conditions and other anomaly
   cases. Fixes the valgrind errors with the capture from
   https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8828
   ------------------------------------------------------------------------
 
 
 Update the release notes.

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

Directory: /trunk-1.8/epan/dissectors/
  Changes    Path                   Action
  +60 -16    packet-dcerpc-ndr.c    Modified
  +219 -147  packet-kdsp.c          Modified

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

Directory: /trunk-1.8/epan/
  Changes    Path          Action
  +12 -9     tvbuff.c      Modified

Directory: /trunk-1.8/plugins/profinet/
  Changes    Path                     Action
  +2 -0      packet-dcerpc-pn-io.c    Modified