[wireshark/f20] fix tap iostat overflow

[Peter Hatina]

commit 32106b705cec5689d8ec093e1305d15c98852361
Author: Peter Hatina <phatina at redhat.com>
Date:   Wed Sep 4 09:25:35 2013 +0200

    fix tap iostat overflow

 wireshark-1.8.x-tap-iostat-overflow.patch |   13 +++++++++++++
 wireshark.spec                            |    7 ++++++-
 2 files changed, 19 insertions(+), 1 deletions(-)
---
diff --git a/wireshark-1.8.x-tap-iostat-overflow.patch b/wireshark-1.8.x-tap-iostat-overflow.patch
new file mode 100644
index 0000000..f253b85
--- /dev/null
+++ b/wireshark-1.8.x-tap-iostat-overflow.patch
@@ -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];
+     }
diff --git a/wireshark.spec b/wireshark.spec
index d734169..90021ad 100644
--- a/wireshark.spec
+++ b/wireshark.spec
@@ -21,7 +21,7 @@
 Summary:	Network traffic analyzer
 Name:		wireshark
 Version:	1.10.0
-Release:	9%{?dist}
+Release:	10%{?dist}
 License:	GPL+
 Group:		Applications/Internet
 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
 Patch8:		wireshark-1.8.x-dcom-string-overrun.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/
 BuildRequires:	libpcap-devel >= 0.9
@@ -145,6 +146,7 @@ and plugins.
 %patch7 -p1 -b .flow-graph-crash
 %patch8 -p1 -b .dcom-overrun
 %patch9 -p1 -b .sctp-bytes-graph-crash
+%patch10 -p1 -b .tap-iostat-overflow
 
 %build
 %ifarch s390 s390x sparcv9 sparc64
@@ -372,6 +374,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 %{_datadir}/aclocal/*
 
 %changelog
+* Wed Sep 04 2013 Peter Hatina <phatina at redhat.com> - 1.10.0-10
+- fix tap iostat overflow
+
 * Wed Sep 04 2013 Peter Hatina <phatina at redhat.com> - 1.10.0-9
 - fix sctp bytes graph crash