[commits] r14189 - in /fsf/trunk/libc: ChangeLog sysdeps/posix/getaddrinfo.c

[eglibc@xxxxxxxxxx]

Author: eglibc
Date: Tue Jun 14 00:03:42 2011
New Revision: 14189

Log:
Import glibc-mainline for 2011-06-14

Modified:
    fsf/trunk/libc/ChangeLog
    fsf/trunk/libc/sysdeps/posix/getaddrinfo.c

Modified: fsf/trunk/libc/ChangeLog
==============================================================================
--- fsf/trunk/libc/ChangeLog (original)
+++ fsf/trunk/libc/ChangeLog Tue Jun 14 00:03:42 2011
@@ -1,3 +1,8 @@
+2011-06-10  Andreas Schwab  <schwab@xxxxxxxxxx>
+
+	* sysdeps/posix/getaddrinfo.c (gaih_inet): Fix logic allocating
+	tmpbuf.
+
 2011-06-10  Roland McGrath  <roland@xxxxxxxxxxxxx>
 
 	* Makerules (shlib.lds): Fail if the linker script comes out empty.

Modified: fsf/trunk/libc/sysdeps/posix/getaddrinfo.c
==============================================================================
--- fsf/trunk/libc/sysdeps/posix/getaddrinfo.c (original)
+++ fsf/trunk/libc/sysdeps/posix/getaddrinfo.c Tue Jun 14 00:03:42 2011
@@ -821,7 +821,7 @@
 	  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
 	    {