fix sctp bytes graph crash

This commit is contained in:
Peter Hatina 2013-09-04 10:14:59 +02:00
parent 2607a01b28
commit 629325b5b0
2 changed files with 21 additions and 1 deletions

View File

@ -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)
{

View File

@ -21,7 +21,7 @@
Summary: Network traffic analyzer
Name: wireshark
Version: 1.10.0
Release: 8%{?dist}
Release: 9%{?dist}
License: GPL+
Group: Applications/Internet
Source0: http://wireshark.org/download/src/%{name}-%{version}.tar.bz2
@ -42,6 +42,7 @@ Patch5: wireshark-1.6.0-soname.patch
Patch6: wireshark-1.8.x-pod2man-encoding.patch
Patch7: wireshark-1.8.x-flow-graph-crash.patch
Patch8: wireshark-1.8.x-dcom-string-overrun.patch
Patch9: wireshark-1.8.x-sctp-bytes-graph-crash.patch
Url: http://www.wireshark.org/
BuildRequires: libpcap-devel >= 0.9
@ -143,6 +144,7 @@ and plugins.
%patch6 -p1 -b .pod2man
%patch7 -p1 -b .flow-graph-crash
%patch8 -p1 -b .dcom-overrun
%patch9 -p1 -b .sctp-bytes-graph-crash
%build
%ifarch s390 s390x sparcv9 sparc64
@ -370,6 +372,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
%{_datadir}/aclocal/*
%changelog
* Wed Sep 04 2013 Peter Hatina <phatina@redhat.com> - 1.10.0-9
- fix sctp bytes graph crash
* Wed Sep 04 2013 Peter Hatina <phatina@redhat.com> - 1.10.0-8
- fix string overrun in plugins/profinet