[wireshark/f17] fixed wireshark crashing when using combo box in import dialog Resolves: #773290
Jan Šafránek
jsafrane at fedoraproject.org
Fri Mar 9 16:36:54 UTC 2012
commit 2346910a00d7959951cc84b3022bdbff211683c8
Author: Jan Safranek <jsafrane at redhat.com>
Date: Fri Mar 9 17:33:40 2012 +0100
fixed wireshark crashing when using combo box in import dialog
Resolves: #773290
wireshark-import-crash.patch | 26 ++++++++++++++++++++++++++
wireshark.spec | 7 ++++++-
2 files changed, 32 insertions(+), 1 deletions(-)
---
diff --git a/wireshark-import-crash.patch b/wireshark-import-crash.patch
new file mode 100644
index 0000000..9e96e13
--- /dev/null
+++ b/wireshark-import-crash.patch
@@ -0,0 +1,26 @@
+773290 - crashes on using combo box in import dialog
+
+commit b313621b783a20281c32ccc11625bf08d6f88048
+Author: etxrab <etxrab at f5534014-38df-0310-8fa8-9805f1628bb7>
+Date: Fri Jan 13 06:22:56 2012 +0000
+
+ From Edward Sheldrake:
+ Wireshark crashes if you open the file import dialog and choose something from the "Encapsulation type" list.
+
+ https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6729
+
+ git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@40448 f5534014-38df-0310-8fa8-9805f1628bb7
+
+diff --git a/gtk/file_import_dlg.c b/gtk/file_import_dlg.c
+index 5ee9f3f..1d7535d 100644
+--- a/gtk/file_import_dlg.c
++++ b/gtk/file_import_dlg.c
+@@ -203,7 +203,7 @@ encap_co_changed(GtkComboBox *widget, gpointer data)
+
+ if (result)
+ {
+- guint8 encap;
++ guint encap;
+ GtkTreeModel *model = gtk_combo_box_get_model(widget);
+ gtk_tree_model_get(model, &iter, 1, &encap, -1);
+
diff --git a/wireshark.spec b/wireshark.spec
index bbb8cec..e0e98ff 100644
--- a/wireshark.spec
+++ b/wireshark.spec
@@ -11,7 +11,7 @@
Summary: Network traffic analyzer
Name: wireshark
Version: 1.6.5
-Release: 1%{?dist}
+Release: 2%{?dist}
License: GPL+
Group: Applications/Internet
Source0: http://wireshark.org/download/src/%{name}-%{version}.tar.bz2
@@ -31,6 +31,7 @@ Patch4: wireshark-1.6.1-group-msg.patch
Patch5: wireshark-1.6.0-soname.patch
Patch6: wireshark-1.6.2-nfsv41-addstatus.patch
Patch7: wireshark-gnome3-msgbox.patch
+Patch8: wireshark-import-crash.patch
Url: http://www.wireshark.org/
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -114,6 +115,7 @@ and plugins.
%patch5 -p1 -b .soname
%patch6 -p1 -b .v4staus
%patch7 -p1 -b .gnome3
+%patch8 -p1 -b .import
%build
%ifarch s390 s390x sparcv9 sparc64
@@ -336,6 +338,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
%{_sbindir}/idl2wrs
%changelog
+* Fri Mar 9 2012 Jan Safranek <jsafrane at redhat.com> - 1.6.5-2
+- fixed wireshark crashing when using combo box in import dialog (#773290)
+
* Wed Jan 11 2012 Jan Safranek <jsafrane at redhat.com> - 1.6.5-1
- upgrade to 1.6.5
- see http://www.wireshark.org/docs/relnotes/wireshark-1.6.5.html
More information about the scm-commits
mailing list