[wireshark/f19] fix tap iostat overflow

[Peter Hatina]

commit 8098cf83b40573036c8d338c3ae472657dbefa96
Author: Peter Hatina <phatina at redhat.com>
Date:   Tue Sep 3 16:40:12 2013 +0200

    fix tap iostat overflow

 wireshark-1.8.x-tap-iostat-overflow.patch |   13 +++++++++++++
 wireshark.spec                            |    5 +++++
 2 files changed, 18 insertions(+), 0 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 da4c0b2..d3e280c 100644
--- a/wireshark.spec
+++ b/wireshark.spec
@@ -42,6 +42,7 @@ 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
+Patch9:		wireshark-1.8.x-tap-iostat-overflow.patch
 
 Url:		http://www.wireshark.org/
 BuildRequires:	libpcap-devel >= 0.9
@@ -142,6 +143,7 @@ and plugins.
 %patch6 -p1 -b .flow-graph-crash
 %patch7 -p1 -b .dcom-overrun
 %patch8 -p1 -b .sctp-bytes-graph-crash
+%patch9 -p1 -b .tap-iostat-overflow
 
 %build
 %ifarch s390 s390x sparcv9 sparc64
@@ -369,6 +371,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-5
+- fix tap iostat overflow
+
 * Tue Sep 03 2013 Peter Hatina <phatina at redhat.com> 1.10.0-4
 - fix sctp bytes graph crash