Fix incorrect free (hits when -lidn is used)
This commit is contained in:
parent
2be9453c6f
commit
6ee9d26770
24
iputils-s20121112-idn-free.patch
Normal file
24
iputils-s20121112-idn-free.patch
Normal file
@ -0,0 +1,24 @@
|
||||
--- iputils-s20121112/ping.c.orig 2012-11-13 13:29:37.000000000 +0100
|
||||
+++ iputils-s20121112/ping.c 2012-11-13 14:45:13.235540884 +0100
|
||||
@@ -122,7 +122,7 @@ main(int argc, char **argv)
|
||||
u_char *packet;
|
||||
char *target;
|
||||
#ifdef USE_IDN
|
||||
- char *hnamebuf;
|
||||
+ char *hnamebuf = NULL;
|
||||
#else
|
||||
char hnamebuf[MAX_HOSTNAMELEN];
|
||||
#endif
|
||||
@@ -263,8 +263,10 @@ main(int argc, char **argv)
|
||||
#ifdef USE_IDN
|
||||
int rc;
|
||||
|
||||
- free(hnamebuf);
|
||||
- hnamebuf = NULL;
|
||||
+ if (hnamebuf) {
|
||||
+ free(hnamebuf);
|
||||
+ hnamebuf = NULL;
|
||||
+ }
|
||||
|
||||
rc = idna_to_ascii_lz(target, &idn, 0);
|
||||
if (rc != IDNA_SUCCESS) {
|
@ -27,6 +27,7 @@ Patch15: iputils-20101006-unused.patch
|
||||
Patch17: iputils-20101006-eth.patch
|
||||
# Accepted upstream, will be in the next release
|
||||
Patch18: iputils-s20121112-sobindtodevice-capability.patch
|
||||
Patch19: iputils-s20121112-idn-free.patch
|
||||
|
||||
BuildRequires: docbook-utils perl-SGMLSpm
|
||||
BuildRequires: glibc-kernheaders >= 2.4-8.19
|
||||
@ -75,6 +76,7 @@ The iputils-sysvinit contains SysV initscritps support.
|
||||
%patch15 -p1 -b .unused
|
||||
%patch17 -p1 -b .eth
|
||||
%patch18 -p1 -b .bindtodevice-cap
|
||||
%patch19 -p1 -b .idn-free
|
||||
|
||||
%build
|
||||
%ifarch s390 s390x
|
||||
@ -162,6 +164,7 @@ mv -f RELNOTES.tmp RELNOTES
|
||||
+ drop unnecessary patches
|
||||
+ update patches
|
||||
+ wrap SO_BINDTODEVICE with the correct capability
|
||||
+ fix incorrect free (hits when -lidn is used)
|
||||
|
||||
* Thu Nov 08 2012 Jan Synáček <jsynacek@redhat.com> - 20121106-2
|
||||
- Update ifenslave tarball (#859182)
|
||||
|
Loading…
Reference in New Issue
Block a user