http://anonsvn.wireshark.org/viewvc/viewvc.cgi?view=rev&revision=43218
User: gerald
Date: 2012/06/11 04:14 PM
Log:
Copy over revisions from the trunk:
------------------------------------------------------------------------
r43139 | darkjames | 2012-06-06 12:59:55 -0700 (Wed, 06 Jun 2012) | 4 lines
Changed paths:
M /trunk/wiretap/netscreen.c
Fix bug #7340
interface name can also contain hyphen (v1-untrust, v1-trust).
------------------------------------------------------------------------
r43144 | etxrab | 2012-06-06 13:44:21 -0700 (Wed, 06 Jun 2012) | 1 line
Changed paths:
M /trunk/epan/dissectors/packet-glusterfs.c
From Niels de Vos: GlusterFS: Display SETATTR attribute valid as a list of flags https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7341
------------------------------------------------------------------------
r43147 | wmeier | 2012-06-07 10:39:11 -0700 (Thu, 07 Jun 2012) | 4 lines
Changed paths:
M /trunk/epan/dissectors/packet-smb2.c
Fix invalid hf[] entry 'display' field value.
result: incorect display of value (and, incidentally,
a crash in 'tshark -G values'
------------------------------------------------------------------------
r43148 | rbalint | 2012-06-07 11:44:20 -0700 (Thu, 07 Jun 2012) | 1 line
Changed paths:
M /trunk/docbook/Makefile.common
fix building Developer Guide from release tarball
------------------------------------------------------------------------
r43150 | wmeier | 2012-06-07 14:10:02 -0700 (Thu, 07 Jun 2012) | 11 lines
Changed paths:
M /trunk/epan/proto.c
Don't crash in 'proto_registrar_dump_values' if BASE_EXT_STRING and no extended string.
Note: this shows up when doing 'tshark -G values'.
BASE_EXT_STRING with a missing extended string does *not* cause issues
with the normal display code:
ToDo (eventually): Add some code to enforce requirement that hf[] entries with BASE_EXT_STRING
(or BASE_RANGE_STRING) set must also have a 'strings' value.
------------------------------------------------------------------------
r43164 | wmeier | 2012-06-08 14:17:42 -0700 (Fri, 08 Jun 2012) | 5 lines
Changed paths:
M /trunk/epan/dissectors/packet-ua3g.c
Fix bug I introduced in SVN #43129.
Fixes fuzz crash reported in Bug #7346.
------------------------------------------------------------------------
Directory: /trunk-1.8/epan/dissectors/
Changes Path Action
+73 -12 packet-glusterfs.c Modified
+1 -1 packet-smb2.c Modified
+13 -8 packet-ua3g.c Modified
Directory: /trunk-1.8/docbook/
Changes Path Action
+2 -1 Makefile.common Modified
Directory: /trunk-1.8/epan/
Changes Path Action
+22 -20 proto.c Modified
Directory: /trunk-1.8/wiretap/
Changes Path Action
+1 -1 netscreen.c Modified
