[gerald@xxxxxxxxxxxxx]

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

User: gerald
Date: 2013/09/09 11:28 AM

Log:
 Copy over revisions from the trunk:
 
   ------------------------------------------------------------------------
   r51422 | mmann | 2013-08-18 17:11:50 -0700 (Sun, 18 Aug 2013) | 5 lines
   Changed paths:
      M /trunk/AUTHORS
      M /trunk/epan/dissectors/packet-ieee80211-radiotap.c
 
   Bugfix SGI Nsym disambiguation is unconditionally displayed when dissecting VHT, bug 8989 (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8989)
 
   From Karl Beldan
 
   BACKPORT(1.8,1.10)
   ------------------------------------------------------------------------
   r51493 | gerald | 2013-08-23 11:42:51 -0700 (Fri, 23 Aug 2013) | 3 lines
   Changed paths:
      M /trunk/rawshark.c
 
   Initialize our wtap_pkthdr struct so that we don't try to dereference an
   invalid opt_comment pointer down the line.
   ------------------------------------------------------------------------
   r51523 | gerald | 2013-08-26 09:53:17 -0700 (Mon, 26 Aug 2013) | 3 lines
   Changed paths:
      M /trunk/packaging/macosx/Resources/Wireshark.icns
 
   Use oldiconutil (https://github.com/uliwitness/oldiconutil) to convert
   our PNG-based icons to JPEG 2000. Hopefully fixes bug 8993.
   ------------------------------------------------------------------------
   r51610 | pascal | 2013-08-31 02:42:11 -0700 (Sat, 31 Aug 2013) | 3 lines
   Changed paths:
      M /trunk/epan/dissectors/packet-bpdu.c
 
   From Andreas Urke via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9088 :
   STP: fix dissection of MSTI Root Identifiers for all MSTIs
   ------------------------------------------------------------------------
 
 
 Copy over with manual intervention:
 
   ------------------------------------------------------------------------
   r51395 | cmaynard | 2013-08-16 13:46:45 -0700 (Fri, 16 Aug 2013) | 4 lines
   Changed paths:
      M /trunk/epan/dissectors/packet-rohc.c
 
   Initialize val_len to avoid Clang warning: The right operand of '-' is a garbage value.  While in there, add some protection against tvb_length_remaining() possibly returning -1, or possibly being less than val_len.
 
   #BACKPORT(1.10)
   ------------------------------------------------------------------------
   r51448 | cmaynard | 2013-08-20 15:42:46 -0700 (Tue, 20 Aug 2013) | 9 lines
   Changed paths:
      M /trunk/epan/dissectors/packet-ncp-sss.c
 
   Simplify find_delimiter() by making use of tvb_find_guint8().
   In sss_string():
    -> Protect against tvb_length_remaining() possibly returning -1.
    -> Fix off-by-1 potential buffer overflow condition.
    -> Use isprint() rather than "do-it-yourself" code.
    -> Remove the extra unnecessary "length_remaining" checks in the for() loop.
 
   #BACKPORT(1.10, 1.8)
   ------------------------------------------------------------------------
   r51508 | eapache | 2013-08-24 05:13:11 -0700 (Sat, 24 Aug 2013) | 3 lines
   Changed paths:
      M /trunk/epan/dissectors/packet-ieee80211.c
 
   Use the correct length field when tagging the SSID. Fixes the first valgrind
   fuzz failure.
   ------------------------------------------------------------------------
   r51576 | cmaynard | 2013-08-29 11:15:13 -0700 (Thu, 29 Aug 2013) | 6 lines
   Changed paths:
      M /trunk/capture_opts.c
      M /trunk/capture_opts.h
      M /trunk/capture_stop_conditions.c
      M /trunk/capture_sync.c
      M /trunk/doc/dumpcap.pod
      M /trunk/doc/tshark.pod
      M /trunk/doc/wireshark.pod.template
      M /trunk/dumpcap.c
      M /trunk/ui/gtk/capture_dlg.c
 
   Handle the 2GiB boundary case of the max filesize autostop condition properly so that we avoid overflow conditions and so that we ensure we don't capture more than 2GiB.  Also, document the max filesize autostop value of 2GIB as well as indicating that it's truly GiB and not GB.
 
   This fixes the problem reported on ask: http://ask.wireshark.org/questions/23891/wireshark-wont-run-with-multiple-capture-files
 
   #BACKPORT(1.10) ... not sure about 1.8?
   ------------------------------------------------------------------------
 
 
 Update the release notes.

Directory: /trunk-1.10/packaging/macosx/Resources/
  Changes    Path              Action
  +0 -0      Wireshark.icns    Modified

Directory: /trunk-1.10/epan/dissectors/
  Changes    Path                           Action
  +1 -1      packet-bpdu.c                  Modified
  +11 -2     packet-ieee80211-radiotap.c    Modified
  +4 -3      packet-ieee80211.c             Modified
  +64 -93    packet-ncp-sss.c               Modified
  +15 -12    packet-rohc.c                  Modified

Directory: /trunk-1.10/doc/
  Changes    Path                      Action
  +4 -4      dumpcap.pod               Modified
  +7 -7      tshark.pod                Modified
  +6 -5      wireshark.pod.template    Modified

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


(8 files not shown)