aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@gmail.com>2011-06-13 08:31:50 -0400
committerAndreas Schwab <schwab@redhat.com>2011-06-14 13:14:41 +0200
commit039ab4445d499689061a7605aa451b61932eef9f (patch)
tree11a815860c83ecdfee1e31055062e61a7eb5d238
parent9b849836f534bbd250a6733ebc1edf32e5f4d5dc (diff)
downloadglibc-039ab4445d499689061a7605aa451b61932eef9f.tar
glibc-039ab4445d499689061a7605aa451b61932eef9f.tar.gz
glibc-039ab4445d499689061a7605aa451b61932eef9f.tar.bz2
glibc-039ab4445d499689061a7605aa451b61932eef9f.zip
Fix memory leak in getaddrinfo
(cherry picked from commit 3154bfb8c7fb84fbf7ecdc787752b395579d2ac7)
-rw-r--r--ChangeLog5
-rw-r--r--sysdeps/posix/getaddrinfo.c2
2 files changed, 6 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 2826e82964..db9d5863d4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2011-06-10 Andreas Schwab <schwab@redhat.com>
+
+ * sysdeps/posix/getaddrinfo.c (gaih_inet): Fix logic allocating
+ tmpbuf.
+
2011-06-07 David S. Miller <davem@davemloft.net>
* sysdeps/sparc/sparc32/dl-irel.h (elf_irela): Pass dl_hwcap to
diff --git a/sysdeps/posix/getaddrinfo.c b/sysdeps/posix/getaddrinfo.c
index 1e017b2ed6..469abe22de 100644
--- a/sysdeps/posix/getaddrinfo.c
+++ b/sysdeps/posix/getaddrinfo.c
@@ -821,7 +821,7 @@ gaih_inet (const char *name, const struct gaih_service *service,
size_t tmpbuflen = 1024;
malloc_tmpbuf = !__libc_use_alloca (alloca_used + tmpbuflen);
assert (tmpbuf == NULL);
- if (malloc_tmpbuf)
+ if (!malloc_tmpbuf)
tmpbuf = alloca_account (tmpbuflen, alloca_used);
else
{