[gerald@xxxxxxxxxxxxx]

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

User: gerald
Date: 2011/05/17 02:31 PM

Log:
 Copy over revisions from the trunk:
 
   ------------------------------------------------------------------------
   r36958 | gerald | 2011-04-30 10:43:05 -0700 (Sat, 30 Apr 2011) | 2 lines
   Changed paths:
      M /trunk/epan/dissectors/packet-dcm.c
 
   Check our PDU length. Fixes the infinite loop found in bug 5876.
   ------------------------------------------------------------------------
   r37011 | gerald | 2011-05-06 12:39:47 -0700 (Fri, 06 May 2011) | 7 lines
   Changed paths:
      M /trunk/epan/diam_dict.l
 
   Huzaifa Sidhpurwala of Red Hat Security Response Team discovered that we
   could dereferene a NULL pointer if we had a corrupted Diameter
   dictionary.
 
   Additionally, it was possible to push an invalid input buffer onto the
   include stack.
   ------------------------------------------------------------------------
   r37068 | gerald | 2011-05-11 15:36:59 -0700 (Wed, 11 May 2011) | 3 lines
   Changed paths:
      M /trunk/wiretap/snoop.c
 
   Check our original record length. Fixes a crash bug found by Huzaifa
   Sidhpurwala of the Red Hat Security Response Team.
   ------------------------------------------------------------------------
   r37115 | guy | 2011-05-12 23:23:58 -0700 (Thu, 12 May 2011) | 2 lines
   Changed paths:
      M /trunk/wireshark.desktop
 
   Pcap files now have an official MIME type.
   ------------------------------------------------------------------------
   r37081 | darkjames | 2011-05-12 09:31:42 -0700 (Thu, 12 May 2011) | 6 lines
   Changed paths:
      M /trunk/epan/tvbuff.c
 
   Fix double free.
 
   compr is also freed outside loop. So free it only when returning.
 
   Might be related with bug #5908, but I don't have access to that bug ;-)
   ------------------------------------------------------------------------
   r37128 | gerald | 2011-05-13 10:12:44 -0700 (Fri, 13 May 2011) | 3 lines
   Changed paths:
      M /trunk/wiretap/visual.c
 
   From Huzaifa Sidhpurwala of the Red Hat Security Response Team: Fix an
   integer overflow in wiretap/visual.c.
   ------------------------------------------------------------------------
 
 
 Copy over with manual intervention:
 
   ------------------------------------------------------------------------
   r37114 | guy | 2011-05-12 23:11:19 -0700 (Thu, 12 May 2011) | 2 lines
   Changed paths:
      M /trunk/packaging/macosx/Info.plist.in
 
   Pcap files now have an official MIME type.
   ------------------------------------------------------------------------
   r37116 | guy | 2011-05-12 23:55:11 -0700 (Thu, 12 May 2011) | 2 lines
   Changed paths:
      M /trunk/packaging/macosx/Info.plist.in
      M /trunk/wireshark.desktop
 
   That's *application*/vnd.tcpdump.pcap to you.
   ------------------------------------------------------------------------

Directory: /trunk-1.2/epan/dissectors/
  Changes    Path            Action
  +7 -0      packet-dcm.c    Modified

Directory: /trunk-1.2/docbook/
  Changes    Path                 Action
  +80 -7     release-notes.xml    Modified

Directory: /trunk-1.2/epan/
  Changes    Path           Action
  +2 -4      diam_dict.l    Modified
  +1 -1      tvbuff.c       Modified

Directory: /trunk-1.2/packaging/macosx/
  Changes    Path             Action
  +1 -1      Info.plist.in    Modified

Directory: /trunk-1.2/
  Changes    Path                 Action
  +1 -0      wireshark.desktop    Modified

Directory: /trunk-1.2/wiretap/
  Changes    Path          Action
  +10 -0     snoop.c       Modified
  +9 -0      visual.c      Modified