rpms/net-tools
7
0
Fork 0
Code Issues Pull Requests Releases Activity

- fix segfault for empty interface (#234045)

Browse Source
This commit is contained in:
Radek Vokál 2007-03-27 07:33:10 +00:00
parent 98ec964987
commit 8add39743b
2 changed files with 31 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
net-tools-1.60-netstat-interfaces-crash.patch Normal file
View File

@ -0,0 +1,25 @@
--- net-tools-1.60/netstat.c.old 2007-03-27 09:28:28.000000000 +0200
+++ net-tools-1.60/netstat.c 2007-03-27 09:26:39.000000000 +0200
@@ -2105,7 +2105,7 @@
fprintf(stderr, _(" netstat { [-veenNac] -I[<Iface>] | [-veenNac] -i | [-cnNe] -M | -s } [delay]\n\n"));
fprintf(stderr, _(" -r, --route display routing table\n"));
- fprintf(stderr, _(" -I, --interfaces=[<Iface>] display interface table for <Iface>\n"));
+ fprintf(stderr, _(" -I, --interface=[<Iface>] display interface table for <Iface>\n"));
fprintf(stderr, _(" -i, --interfaces display interface table\n"));
fprintf(stderr, _(" -g, --groups display multicast group memberships\n"));
fprintf(stderr, _(" -s, --statistics display networking statistics (like SNMP)\n"));
@@ -2234,7 +2234,12 @@
case 'I':
if (optarg && strcmp(optarg, "(null)"))
if (optarg[0] == '=') optarg++;
- flag_int_name = strdup(optarg);
+ if (optarg && strcmp(optarg, "(null)"))
+ flag_int_name = strdup(optarg);
+ else {
+ usage();
+ exit(1);
+ }
flag_int++;
break;
case 'i':

7
net-tools.spec
View File

@ -3,7 +3,7 @@
Summary: Basic networking tools Summary: Basic networking tools
Name: net-tools Name: net-tools
Version: 1.60 Version: 1.60
Release: 80%{?dist} Release: 81%{?dist}
License: GPL License: GPL
Group: System Environment/Base Group: System Environment/Base
URL: http://www.tazenda.demon.co.uk/phil/net-tools/ URL: http://www.tazenda.demon.co.uk/phil/net-tools/
@ -72,6 +72,7 @@ Patch58: net-tools-1.60-nameif_strncpy.patch
Patch59: net-tools-1.60-arp-unaligned-access.patch Patch59: net-tools-1.60-arp-unaligned-access.patch
Patch60: net-tools-1.60-sctp-quiet.patch Patch60: net-tools-1.60-sctp-quiet.patch
Patch61: net-tools-1.60-remove_node.patch Patch61: net-tools-1.60-remove_node.patch
Patch62: net-tools-1.60-netstat-interfaces-crash.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Requires(post): /sbin/chkconfig Requires(post): /sbin/chkconfig
@ -144,6 +145,7 @@ ifconfig, netstat, route, and others.
%patch59 -p1 -b .arp-un-access %patch59 -p1 -b .arp-un-access
%patch60 -p1 -b .quiet %patch60 -p1 -b .quiet
%patch61 -p1 %patch61 -p1
%patch62 -p1 -b .iface-crash
cp %SOURCE2 ./config.h cp %SOURCE2 ./config.h
cp %SOURCE3 ./config.make cp %SOURCE3 ./config.make
@ -259,6 +261,9 @@ exit 0
%{_sysconfdir}/rc.d/init.d/netplugd %{_sysconfdir}/rc.d/init.d/netplugd
%changelog %changelog
* Tue Mar 27 2007 Radek Vokál <rvokal@redhat.com> - 1.60-81
- fix segfault for empty interface (#234045)
* Thu Mar 15 2007 Radek Vokál <rvokal@redhat.com> - 1.60-80 * Thu Mar 15 2007 Radek Vokál <rvokal@redhat.com> - 1.60-80
- we don't have -n/--node option (#225554) - we don't have -n/--node option (#225554)