rpms/wireshark
6
0
Fork 0
Code Issues Pull Requests Releases Activity

fix tap iostat overflow

Browse Source
This commit is contained in:
Peter Hatina 2013-09-04 10:16:58 +02:00
parent 629325b5b0
commit f0bdc15d66
2 changed files with 19 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
wireshark-1.8.x-tap-iostat-overflow.patch Normal file
View File

@ -0,0 +1,13 @@
diff --git a/ui/cli/tap-iostat.c b/ui/cli/tap-iostat.c
index 6722c01..dd1c6f1 100644
--- a/ui/cli/tap-iostat.c
+++ b/ui/cli/tap-iostat.c
@@ -927,7 +927,7 @@ iostat_draw(void *arg)
num_rows = (int)(duration/interval) + (((duration%interval+500000)/1000000) > 0 ? 1 : 0);
/* Load item_in_column with the first item in each column */
- item_in_column = (io_stat_item_t **) g_malloc(sizeof(io_stat_item_t) * num_cols);
+ item_in_column = (io_stat_item_t **) g_malloc(sizeof(io_stat_item_t *) * num_cols);
for (j=0; j<num_cols; j++) {
item_in_column[j] = stat_cols[j];
}

7
wireshark.spec
View File

@ -21,7 +21,7 @@
Summary: Network traffic analyzer Summary: Network traffic analyzer
Name: wireshark Name: wireshark
Version: 1.10.0 Version: 1.10.0
Release: 9%{?dist} Release: 10%{?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
@ -43,6 +43,7 @@ Patch6: wireshark-1.8.x-pod2man-encoding.patch
Patch7: wireshark-1.8.x-flow-graph-crash.patch Patch7: wireshark-1.8.x-flow-graph-crash.patch
Patch8: wireshark-1.8.x-dcom-string-overrun.patch Patch8: wireshark-1.8.x-dcom-string-overrun.patch
Patch9: wireshark-1.8.x-sctp-bytes-graph-crash.patch Patch9: wireshark-1.8.x-sctp-bytes-graph-crash.patch
Patch10: wireshark-1.8.x-tap-iostat-overflow.patch
Url: http://www.wireshark.org/ Url: http://www.wireshark.org/
BuildRequires: libpcap-devel >= 0.9 BuildRequires: libpcap-devel >= 0.9
@ -145,6 +146,7 @@ and plugins.
%patch7 -p1 -b .flow-graph-crash %patch7 -p1 -b .flow-graph-crash
%patch8 -p1 -b .dcom-overrun %patch8 -p1 -b .dcom-overrun
%patch9 -p1 -b .sctp-bytes-graph-crash %patch9 -p1 -b .sctp-bytes-graph-crash
%patch10 -p1 -b .tap-iostat-overflow
%build %build
%ifarch s390 s390x sparcv9 sparc64 %ifarch s390 s390x sparcv9 sparc64
@ -372,6 +374,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
%{_datadir}/aclocal/* %{_datadir}/aclocal/*
%changelog %changelog
* Wed Sep 04 2013 Peter Hatina <phatina@redhat.com> - 1.10.0-10
- fix tap iostat overflow
* Wed Sep 04 2013 Peter Hatina <phatina@redhat.com> - 1.10.0-9 * Wed Sep 04 2013 Peter Hatina <phatina@redhat.com> - 1.10.0-9
- fix sctp bytes graph crash - fix sctp bytes graph crash