fix capture crash (#894753)

This commit is contained in:
Peter Hatina 2013-03-27 09:26:19 +01:00
parent 36d36eff29
commit f0c20e216a
2 changed files with 32 additions and 1 deletions

View File

@ -0,0 +1,26 @@
diff --git a/ui/gtk/capture_dlg.c b/ui/gtk/capture_dlg.c
index f0d1115..db165f1 100644
--- a/ui/gtk/capture_dlg.c
+++ b/ui/gtk/capture_dlg.c
@@ -4206,6 +4206,10 @@ capture_start_cb(GtkWidget *w _U_, gpointer d _U_)
airpcap_set_toolbar_start_capture(airpcap_if_active);
#endif
+ /* XXX - will closing this remove a temporary file? */
+ if (!do_file_close(&cfile, FALSE, " before starting a new capture"))
+ return;
+
if (cap_open_w) {
/*
* There's an options dialog; get the values from it and close it.
@@ -4230,9 +4234,7 @@ capture_start_cb(GtkWidget *w _U_, gpointer d _U_)
return;
}
- /* XXX - will closing this remove a temporary file? */
- if (do_file_close(&cfile, FALSE, " before starting a new capture"))
- capture_start_confirmed();
+ capture_start_confirmed();
}

View File

@ -21,7 +21,7 @@
Summary: Network traffic analyzer Summary: Network traffic analyzer
Name: wireshark Name: wireshark
Version: 1.8.6 Version: 1.8.6
Release: 3%{?dist} Release: 4%{?dist}
License: GPL+ License: GPL+
Group: Applications/Internet Group: Applications/Internet
Source0: http://wireshark.org/download/src/%{name}-%{version}.tar.bz2 Source0: http://wireshark.org/download/src/%{name}-%{version}.tar.bz2
@ -41,6 +41,7 @@ Patch4: wireshark-1.6.1-group-msg.patch
Patch5: wireshark-1.6.0-soname.patch Patch5: wireshark-1.6.0-soname.patch
Patch6: wireshark-1.8.2-python-symbols.patch Patch6: wireshark-1.8.2-python-symbols.patch
Patch7: wireshark-1.8.x-dns-cleanup.patch Patch7: wireshark-1.8.x-dns-cleanup.patch
Patch8: wireshark-1.8.x-capture-crash.patch
Url: http://www.wireshark.org/ Url: http://www.wireshark.org/
BuildRequires: libpcap-devel >= 0.9 BuildRequires: libpcap-devel >= 0.9
@ -140,6 +141,7 @@ and plugins.
%patch5 -p1 -b .soname %patch5 -p1 -b .soname
%patch6 -p1 -b .python-symbols %patch6 -p1 -b .python-symbols
%patch7 -p1 -b .dns-cleanup %patch7 -p1 -b .dns-cleanup
%patch8 -p1 -b .capture-crash
%build %build
%ifarch s390 s390x sparcv9 sparc64 %ifarch s390 s390x sparcv9 sparc64
@ -365,6 +367,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
%{_datadir}/aclocal/* %{_datadir}/aclocal/*
%changelog %changelog
* Wed Mar 27 2013 Peter Hatina <phatina@redhat.com> 1.8.6-4
- fix capture crash (#894753)
* Tue Mar 19 2013 Peter Hatina <phatina@redhat.com> 1.8.6-3 * Tue Mar 19 2013 Peter Hatina <phatina@redhat.com> 1.8.6-3
- fix dns resolving crash (#908211) - fix dns resolving crash (#908211)