about summary refs log tree commit diff
diff options
context:
space:
mode:
authorAndreas Schwab <schwab@redhat.com>2011-08-04 15:42:10 -0400
committerUlrich Drepper <drepper@gmail.com>2011-08-04 15:42:10 -0400
commit2e96f1c73b06e81da59ef7fffa426dc201875f31 (patch)
tree866d87d3290959141c5485065b9c21ab7352cfb4
parent85188888f63b9fc7f40437baeed4c7d6e4f30e18 (diff)
downloadglibc-2e96f1c73b06e81da59ef7fffa426dc201875f31.tar.gz
glibc-2e96f1c73b06e81da59ef7fffa426dc201875f31.tar.xz
glibc-2e96f1c73b06e81da59ef7fffa426dc201875f31.zip
Fix encoding name for IDN in getaddrinfo
-rw-r--r--ChangeLog5
-rw-r--r--sysdeps/posix/getaddrinfo.c5
2 files changed, 9 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index fbacbd5699..0392853b19 100644
--- 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-08-01  Jakub Jelinek  <jakub@redhat.com>
 
 	* sysdeps/ieee754/dbl-64/k_rem_pio2.c (__kernel_rem_pio2): Fix up fq
diff --git a/sysdeps/posix/getaddrinfo.c b/sysdeps/posix/getaddrinfo.c
index 6d574c51e8..a5aafe93ac 100644
--- 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