[gerald@xxxxxxxxxxxxx]

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

User: gerald
Date: 2013/10/31 10:46 PM

Log:
 Copy over revisions from the trunk:
 
   ------------------------------------------------------------------------
   r52209 | mmann | 2013-09-24 14:06:05 -0700 (Tue, 24 Sep 2013) | 3 lines
   Changed paths:
      M /trunk/plugins/wimax/packet-wmx.c
 
   Prevent crashing as a result of tree removal in r52208.  Tree removal + this patch should be the "quick" fix to bug 5349 (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5349).  I knew the tree check was preventing some dissection/column data/etc, but from the comments in bug 5349, the tree check was also protecting this (and maybe other) crashes (due to missed NULL checking).
 
   I want to follow up with some massive cleanup (remove PITEM_FINFO calls), but this with r52208 should be good enough to backport to 1.8 and 1.10 to fix bug 5349.  Cleanup shouldn't need to be backported.
   ------------------------------------------------------------------------
   r52734 | mmann | 2013-10-21 08:50:23 -0700 (Mon, 21 Oct 2013) | 3 lines
   Changed paths:
      M /trunk/epan/dissectors/packet-dcerpc-nt.c
 
   Datablob size is NDR64/32 dependant.  Bug 9301 (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9301).
 
   From Matthieu Patou
   ------------------------------------------------------------------------
   r52735 | mmann | 2013-10-21 08:58:52 -0700 (Mon, 21 Oct 2013) | 1 line
   Changed paths:
      M /trunk/epan/dissectors/packet-dcerpc-nt.c
 
   Fix compile errors introduced in r52734.
   ------------------------------------------------------------------------
   r52736 | mmann | 2013-10-21 09:00:37 -0700 (Mon, 21 Oct 2013) | 3 lines
   Changed paths:
      M /trunk/epan/dissectors/packet-dcerpc.c
 
   dce-rpc: properly dissect multiple PDU in the same packet. Bug 9302 (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9302).
 
   From Matthieu Patou
   ------------------------------------------------------------------------
   r52738 | cmaynard | 2013-10-21 10:31:22 -0700 (Mon, 21 Oct 2013) | 4 lines
   Changed paths:
      M /trunk/epan/dissectors/packet-eth.c
      M /trunk/epan/dissectors/packet-ethertype.c
 
   Remove if (fh_tree) checks as add_ethernet_trailer() calls such functions as dissector_try_heuristic(),  expert_add_info(), and col_append_str(), which all need to be called whether fh_tree is NULL or not.
 
   #BACKPORT(1.10,1.8)
   ------------------------------------------------------------------------
   r52838 | cmaynard | 2013-10-25 05:51:16 -0700 (Fri, 25 Oct 2013) | 4 lines
   Changed paths:
      M /trunk/tshark.c
 
   Display the frame number on the packet summary line if it's one of the configured columns.  Fixes https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9317
 
   #BACKPORT(1.10,1.8)
   ------------------------------------------------------------------------
   r52977 | eapache | 2013-10-29 18:42:11 -0700 (Tue, 29 Oct 2013) | 6 lines
   Changed paths:
      M /trunk/epan/packet.c
 
   When adding an entry to a dissector string table, take a copy of the pattern
   string (and pass g_free to g_hash_table_new_full to free it).
 
   This means callers don't have to worry about the scope of the memory they pass
   in, and fixes https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9296
   ------------------------------------------------------------------------
 
 Update the release notes.

Directory: /trunk-1.8/epan/dissectors/
  Changes    Path                  Action
  +4 -4      packet-dcerpc-nt.c    Modified
  +15 -13    packet-dcerpc.c       Modified
  +1 -1      packet-eth.c          Modified
  +0 -3      packet-ethertype.c    Modified

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

Directory: /trunk-1.8/epan/
  Changes    Path          Action
  +3 -3      packet.c      Modified

Directory: /trunk-1.8/ui/gtk/
  Changes    Path          Action
  +2 -2      uat_gui.c     Modified

Directory: /trunk-1.8/
  Changes    Path          Action
  +0 -15     tshark.c      Modified

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