Fix encoding name for IDN in getaddrinfo

(cherry picked from commit 2e96f1c73b06e81da59ef7fffa426dc201875f31)

diff --git a/ChangeLog b/ChangeLog
index 2f637949836997620211fc934a0b43e6795f65d5..cdaab23fafd2194004844d558b180495199c9dbe 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2011-07-26  Andreas Schwab  <schwab@redhat.com>
+
+       * sysdeps/posix/getaddrinfo.c (gaih_inet): Don't discard result of
+       encoding to ACE if AI_IDN.
+
 2011-07-25  Andreas Schwab  <schwab@redhat.com>
 
        * sysdeps/i386/i486/bits/string.h (__strncat_g): Correctly handle

diff --git a/sysdeps/posix/getaddrinfo.c b/sysdeps/posix/getaddrinfo.c
index 27ce75edc1910d770d3b71a366244315b2313f7a..13dbe10cece5d3e5b2142294a97f78c33dee6bc9 100644 (file)
--- a/sysdeps/posix/getaddrinfo.c
+++ b/sysdeps/posix/getaddrinfo.c
@@ -432,7 +432,10 @@ gaih_inet (const char *name, const struct gaih_service *service,
          /* In case the output string is the same as the input string
             no new string has been allocated.  */
          if (p != name)
-           malloc_name = true;
+           {
+             name = p;
+             malloc_name = true;
+           }
        }
 #endif