[wireshark/f19] fix sctp bytes graph crash

Peter Hatina phatina at fedoraproject.org
Wed Sep 4 09:09:28 UTC 2013


commit 01b6afa8d4e358ce4afce8aec7d5b4b71fb7667c
Author: Peter Hatina <phatina at redhat.com>
Date:   Tue Sep 3 16:32:13 2013 +0200

    fix sctp bytes graph crash

 wireshark-1.8.x-sctp-bytes-graph-crash.patch |   15 +++++++++++++++
 wireshark.spec                               |    7 ++++++-
 2 files changed, 21 insertions(+), 1 deletions(-)
---
diff --git a/wireshark-1.8.x-sctp-bytes-graph-crash.patch b/wireshark-1.8.x-sctp-bytes-graph-crash.patch
new file mode 100644
index 0000000..5915d42
--- /dev/null
+++ b/wireshark-1.8.x-sctp-bytes-graph-crash.patch
@@ -0,0 +1,15 @@
+diff --git a/ui/gtk/sctp_byte_graph_dlg.c b/ui/gtk/sctp_byte_graph_dlg.c
+index 0749342..4cd74c6 100644
+--- a/ui/gtk/sctp_byte_graph_dlg.c
++++ b/ui/gtk/sctp_byte_graph_dlg.c
+@@ -1145,9 +1145,8 @@ on_button_release_event (GtkWidget *widget _U_, GdkEventButton *event, gpointer
+ 			tmptsn =(tsn_t*)(tsnlist->data);
+ 			tfirst = tsn->secs + tsn->usecs/1000000.0;
+ 
+-			while (tsnlist)
++			for (tsnlist = g_list_previous(tsnlist); tsnlist; tsnlist = g_list_previous(tsnlist))
+ 			{
+-				tsnlist = g_list_previous(tsnlist);
+ 				tsn = (tsn_t*) (tsnlist->data);
+ 				if (tsn->secs+tsn->usecs/1000000.0<x_value)
+ 				{
diff --git a/wireshark.spec b/wireshark.spec
index 0e04688..da4c0b2 100644
--- a/wireshark.spec
+++ b/wireshark.spec
@@ -21,7 +21,7 @@
 Summary:	Network traffic analyzer
 Name:		wireshark
 Version:	1.10.0
-Release:	3%{?dist}
+Release:	4%{?dist}
 License:	GPL+
 Group:		Applications/Internet
 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
 Patch6:		wireshark-1.8.x-flow-graph-crash.patch
 Patch7:		wireshark-1.8.x-dcom-string-overrun.patch
+Patch8:		wireshark-1.8.x-sctp-bytes-graph-crash.patch
 
 Url:		http://www.wireshark.org/
 BuildRequires:	libpcap-devel >= 0.9
@@ -140,6 +141,7 @@ and plugins.
 %patch5 -p1 -b .soname
 %patch6 -p1 -b .flow-graph-crash
 %patch7 -p1 -b .dcom-overrun
+%patch8 -p1 -b .sctp-bytes-graph-crash
 
 %build
 %ifarch s390 s390x sparcv9 sparc64
@@ -367,6 +369,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 %{_datadir}/aclocal/*
 
 %changelog
+* Tue Sep 03 2013 Peter Hatina <phatina at redhat.com> 1.10.0-4
+- fix sctp bytes graph crash
+
 * Tue Sep 03 2013 Peter Hatina <phatina at redhat.com> 1.10.0-3
 - fix string overrin in plugins/profinet
 


More information about the scm-commits mailing list