http://anonsvn.wireshark.org/viewvc/viewvc.cgi?view=rev&revision=51876
User: gerald
Date: 2013/09/09 12:05 PM
Log:
Copy over revisions from the trunk:
------------------------------------------------------------------------
r51020 | martink | 2013-07-29 14:10:13 -0700 (Mon, 29 Jul 2013) | 5 lines
Changed paths:
M /trunk/epan/proto.c
add a NULL check to report_type_length_mismatch()
this might be called via proto_tree_add_item() with tree==NULL
which results in a crash
------------------------------------------------------------------------
r51872 | stig | 2013-09-09 10:49:22 -0700 (Mon, 09 Sep 2013) | 6 lines
Changed paths:
M /trunk/epan/wslua/wslua_tvb.c
Removed return value from ByteArray append and prepend, as this did push
the same ByteArray twice (and thus calling the GC twice).
This should fix bug 4461.
Changed ByteArray concat to create a new array to be returned.
------------------------------------------------------------------------
Update the release notes.
Directory: /trunk-1.10/docbook/
Changes Path Action
+2 -0 release-notes.asciidoc Modified
Directory: /trunk-1.10/epan/
Changes Path Action
+8 -6 proto.c Modified
Directory: /trunk-1.10/epan/wslua/
Changes Path Action
+7 -6 wslua_tvb.c Modified