[gerald@xxxxxxxxxxxxx]

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

User: gerald
Date: 2013/07/17 04:21 PM

Log:
 Copy over revisions from the trunk:
 
   ------------------------------------------------------------------------
   r50335 | cmaynard | 2013-07-02 18:47:18 -0700 (Tue, 02 Jul 2013) | 3 lines
   Changed paths:
      M /trunk/tools/lemon/lemon.c
 
   Fix Coverity CID 280323 (Free of array-typed value) by ensuring that tpltname doesn't point to the buf[] stack array before attempting to free it.
   #BACKPORT(1.10)
   ------------------------------------------------------------------------
   r50336 | cmaynard | 2013-07-02 19:28:26 -0700 (Tue, 02 Jul 2013) | 4 lines
   Changed paths:
      M /trunk/tools/lemon/lempar.c
 
   Fix Coverity CID 660 (Negative array index read) by holding off the assignment to yytos until after we check that pParser->yyidx is non-negative.
   See also: http://cwe.mitre.org/data/definitions/129.html
   #BACKPORT(1.10)
   ------------------------------------------------------------------------
   r50341 | ruengeler | 2013-07-03 07:12:44 -0700 (Wed, 03 Jul 2013) | 2 lines
   Changed paths:
      M /trunk/ui/gtk/sctp_byte_graph_dlg.c
 
   Attachment #11134 proposed as fix for bug #8899 by Peter Hatina
   ------------------------------------------------------------------------
   r50397 | eapache | 2013-07-05 19:49:57 -0700 (Fri, 05 Jul 2013) | 5 lines
   Changed paths:
      M /trunk/tshark.c
 
   Fix the last remnant of https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8160
 
   Correctly calculate delta-displayed time when using two-pass dissection with a
   display filter.
   ------------------------------------------------------------------------
   r50423 | eapache | 2013-07-06 14:55:10 -0700 (Sat, 06 Jul 2013) | 5 lines
   Changed paths:
      M /trunk/ui/cli/tap-iostat.c
 
   From Peter Hatina via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8888
 
   We're allocating an array of pointers, not an array of objects, so make the
   sizeof() reflect that to avoid over-allocating.
   ------------------------------------------------------------------------
   r50445 | morriss | 2013-07-08 09:25:13 -0700 (Mon, 08 Jul 2013) | 6 lines
   Changed paths:
      M /trunk/doc/tshark.pod
      M /trunk/doc/wireshark.pod.template
      M /trunk/tshark.c
      M /trunk/ui/gtk/main.c
 
   From Jim Young via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8906 :
 
   This patch augments Wireshark's and tshark's augument usage reports (-? and
   -t?) and the Wireshark and tshark man pages to list all available timestamp
   options available for the -t option.
   ------------------------------------------------------------------------
   r50465 | cmaynard | 2013-07-09 09:44:47 -0700 (Tue, 09 Jul 2013) | 4 lines
   Changed paths:
      M /trunk/ui/gtk/io_stat.c
 
   Remove the advanced filter field arbitrary text limit of 100 and remove the filter field arbitrary text limit of 256.
   Fixes https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8909
   #BACKPORT(1.10,1.8)
   ------------------------------------------------------------------------
   r50466 | cmaynard | 2013-07-09 09:58:07 -0700 (Tue, 09 Jul 2013) | 2 lines
   Changed paths:
      M /trunk/ui/gtk/io_stat.c
 
   Use sizeof() instead of hard-coded values.  Other minor whitespace cleanup.
   ------------------------------------------------------------------------
   r50469 | cmaynard | 2013-07-09 11:01:44 -0700 (Tue, 09 Jul 2013) | 3 lines
   Changed paths:
      M /trunk/ui/gtk/io_stat.c
 
   Another change that should have been part of r50465, which removed the limits to the number of characters in the display filter(s).  [Technically, there is still the inherent 65535 limit.]
   #BACKPORT(1.10,1.8)
   ------------------------------------------------------------------------
   r50471 | stig | 2013-07-09 12:00:11 -0700 (Tue, 09 Jul 2013) | 4 lines
   Changed paths:
      M /trunk/ui/gtk/profile_dlg.c
 
   Avoid having double "Default" entry in "Create New Profile".
 
   #BACKPORT 1.10
   ------------------------------------------------------------------------
 
 Update the release notes.

Directory: /trunk-1.10/ui/cli/
  Changes    Path            Action
  +1 -1      tap-iostat.c    Modified

Directory: /trunk-1.10/doc/
  Changes    Path                      Action
  +13 -7     tshark.pod                Modified
  +13 -7     wireshark.pod.template    Modified

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

Directory: /trunk-1.10/ui/gtk/
  Changes    Path                     Action
  +39 -38    io_stat.c                Modified
  +4 -3      main.c                   Modified
  +0 -2      profile_dlg.c            Modified
  +1 -2      sctp_byte_graph_dlg.c    Modified

Directory: /trunk-1.10/tools/lemon/
  Changes    Path          Action
  +6 -6      lemon.c       Modified
  +34 -18    lempar.c      Modified


(1 file not shown)