Wireshark · Wireshark-commits: [Wireshark-commits] rev 44507: /trunk-1.6/epan/ /trunk-1.6/epan/dissectors/: packet-btl2cap.c packet

[gerald@xxxxxxxxxxxxx]

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

User: gerald
Date: 2012/08/14 02:43 PM

Log:
 Copy over r44500 from the trunk:
 
   ------------------------------------------------------------------------
   r44500 | tuexen | 2012-08-14 13:31:49 -0700 (Tue, 14 Aug 2012) | 3 lines
   Changed paths:
      M /trunk/epan/dissectors/packet-sctp.c
      M /trunk/epan/sctpppids.h
 
   Update SCTP PPIDs.
   This also fixes https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7635
   ------------------------------------------------------------------------
 
 
 Copy over with manual intervention:
 
   ------------------------------------------------------------------------
   r44476 | gerald | 2012-08-13 12:30:42 -0700 (Mon, 13 Aug 2012) | 3 lines
   Changed paths:
      M /trunk/epan/dissectors/packet-btl2cap.c
 
   Add length checks to make sure we don't underflow an integer. Make
   sure we allocate and copy the same amount of data. Fixes bug 7621.
   ------------------------------------------------------------------------
   r44491 | mmann | 2012-08-14 09:29:38 -0700 (Tue, 14 Aug 2012) | 1 line
   Changed paths:
      M /trunk/epan/dissectors/packet-fclctl.c
      M /trunk/epan/dissectors/packet-lisp.c
 
   fix subtle g_strdup_printf() memory leaks with ephemeral memory
   ------------------------------------------------------------------------
 
 
 Update the release notes.

Directory: /trunk-1.6/epan/dissectors/
  Changes    Path                Action
  +26 -14    packet-btl2cap.c    Modified
  +2 -2      packet-fclctl.c     Modified
  +2 -2      packet-lisp.c       Modified
  +3 -0      packet-sctp.c       Modified

Directory: /trunk-1.6/epan/
  Changes    Path           Action
  +3 -0      sctpppids.h    Modified