diff options
| author | Gerald Combs <gerald@wireshark.org> | 2012-08-14 21:51:57 +0000 |
|---|---|---|
| committer | Gerald Combs <gerald@wireshark.org> | 2012-08-14 21:51:57 +0000 |
| commit | c9e82dfe3675bea1a6112198341382bc5067314a (patch) | |
| tree | 89b42c4b9cf1eaf4e3d16c41a7bd7e7f70af94ac /make-version.pl | |
| parent | d57e1a0c9a1df54a4ccec698cfe0b1adfb332acf (diff) | |
| download | wireshark-c9e82dfe3675bea1a6112198341382bc5067314a.tar.gz wireshark-c9e82dfe3675bea1a6112198341382bc5067314a.tar.bz2 wireshark-c9e82dfe3675bea1a6112198341382bc5067314a.zip | |
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
fix subtle g_strdup_printf() memory leaks with ephemeral memory
------------------------------------------------------------------------
Update the release notes.
svn path=/trunk-1.4/; revision=44508
Diffstat (limited to 'make-version.pl')
0 files changed, 0 insertions, 0 deletions