Wireshark · Wireshark-commits: [Wireshark-commits] rev 36062: /trunk-1.2/ /trunk-1.2/docbook/: release-notes.xml /trunk-1.2/gtk/: c

[gerald@xxxxxxxxxxxxx]

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

User: gerald
Date: 2011/02/24 05:04 PM

Log:
 Copy over with manual intervention:
 
 ------------------------------------------------------------------------
 r35633 | wmeier | 2011-01-23 12:59:12 -0800 (Sun, 23 Jan 2011) | 7 lines
 Changed paths:
    M /trunk/gtk/capture_dlg.c
 
 Fix a crash which can occur if a user hits "Capture:Options" immediately followed by "Capture:Start"
 
 Fixes Bug #4645: https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4645
 
 Essentially: The "Capture Start" code "interrupted" the "Capture Options" code and attempted
  to use not yet initialized "Capture Options" state.
 ------------------------------------------------------------------------
 r35788 | wmeier | 2011-02-03 11:33:48 -0800 (Thu, 03 Feb 2011) | 12 lines
 Changed paths:
    M /trunk/tools/win-setup.sh
 
 Fix: Cygwin make fails after updating to bash v 4.1.9.2
 
 Extracts from the cygwin Bash 4.1.9.2 release announcement:
 
 4a. For a single affected script, add this line just after the she-bang:
  (set -o igncr) 2>/dev/null && set -o igncr; # comment is needed
 
 4e. bash-4.1.9-1 dropped support for 'shopt -s igncr';
 
 I'm assuming this is backwards compatible; If not, we'll know quite shortly :) 
 ------------------------------------------------------------------------
 r36061 | wmeier | 2011-02-24 16:40:22 -0800 (Thu, 24 Feb 2011) | 6 lines
 Changed paths:
    M /trunk/wiretap/lanalyzer.c
 
 From Robert Bullen: Fix "Potential access violation when writing to LANalyzer files"
 https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5698
 
 (Note from me: Before the fix "File ! Save As" in Lanalyzer format
                 crashed quite consistently on my Windows 7)
 ------------------------------------------------------------------------
 
 Update the release notes.

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

Directory: /trunk-1.2/gtk/
  Changes    Path             Action
  +57 -9     capture_dlg.c    Modified

Directory: /trunk-1.2/tools/
  Changes    Path              Action
  +2 -1      win32-setup.sh    Modified

Directory: /trunk-1.2/wiretap/
  Changes    Path           Action
  +13 -1     lanalyzer.c    Modified