- fixed un-initialized device (#158914)

This commit is contained in:
Radek Vokál 2005-05-27 07:20:44 +00:00
parent 751612745c
commit 5f89512434
2 changed files with 46 additions and 1 deletions

View File

@ -0,0 +1,40 @@
--- iputils/ping.c 2005-05-18 01:37:05.621810488 -0400
+++ iputils/ping.c.new 2005-05-18 01:41:27.113018222 -0400
@@ -101,7 +101,7 @@ static struct {
int cmsg_len;
struct sockaddr_in source;
-char *device;
+char *device=NULL;
int pmtudisc = -1;
@@ -177,7 +177,7 @@ main(int argc, char **argv)
ptr[3] = i4;
options |= F_STRICTSOURCE;
} else {
- device = optarg;
+ device = strdup(optarg);
}
break;
}
--- iputils/ping6.c 2005-05-18 01:37:05.620833925 -0400
+++ iputils/ping6.c.new 2005-05-18 01:41:23.599346390 -0400
@@ -155,7 +155,7 @@ static int pr_icmph(__u8 type, __u8 code
static void usage(void) __attribute((noreturn));
struct sockaddr_in6 source;
-char *device;
+char *device=NULL;
int pmtudisc=-1;
static int icmp_sock;
@@ -248,7 +248,7 @@ int main(int argc, char *argv[])
}
options |= F_STRICTSOURCE;
} else {
- device = optarg;
+ device = strdup(optarg);
}
break;
case 'M':

View File

@ -1,7 +1,7 @@
Summary: Network monitoring tools including ping.
Name: iputils
Version: 20020927
Release: 22
Release: 23
License: BSD
Group: System Environment/Daemons
Source0: http://www.tux.org/pub/net/ip-routing/%{name}-ss020927.tar.gz
@ -21,6 +21,7 @@ Patch9: iputils-20020927-unaligned.patch
Patch10: iputils-20020927-inet_pton.patch
Patch11: iputils-retvals.patch
Patch12: iputils-arping.patch
Patch13: iputils-20020927-ia64_align.patch
Prefix: %{_prefix}
BuildRoot: %{_tmppath}/%{name}-root
BuildPreReq: docbook-utils perl-SGMLSpm
@ -50,6 +51,7 @@ cp %{SOURCE2} .
%patch10 -p1 -b .inet_pton
%patch11 -p1 -b .retvals
%patch12 -b .arping
%patch13 -p1 -b .align
%build
%ifarch s390 s390x
@ -146,6 +148,9 @@ rm -rf ${RPM_BUILD_ROOT}
%config(noreplace) %{_sysconfdir}/rc.d/init.d/rdisc
%changelog
* Fri May 27 2005 Radek Vokal <rvokal@redhat.com> 20020927-23
- fixed un-initialized "device" (#158914)
* Thu Apr 07 2005 Radek Vokal <rvokal@redhat.com> 20020927-22
- don't start rdisc as default (#154075)