diff options
| author | Andreas Schwab <schwab@redhat.com> | 2011-08-04 15:42:10 -0400 |
|---|---|---|
| committer | Andreas Schwab <schwab@redhat.com> | 2011-08-05 10:03:29 +0200 |
| commit | c57be1aeee682c02664e5d92b8c597a376611bfe (patch) | |
| tree | a1148f7a3710761f46932e588b86dc56ebd95816 | |
| parent | 8cb4ac4610e7b7c17a0e7350f92ea0d4bc06b019 (diff) | |
| download | glibc-c57be1aeee682c02664e5d92b8c597a376611bfe.tar.gz glibc-c57be1aeee682c02664e5d92b8c597a376611bfe.tar.xz glibc-c57be1aeee682c02664e5d92b8c597a376611bfe.zip | |
Fix encoding name for IDN in getaddrinfo
(cherry picked from commit 2e96f1c73b06e81da59ef7fffa426dc201875f31)
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | sysdeps/posix/getaddrinfo.c | 5 |
2 files changed, 9 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog index 2f63794983..cdaab23faf 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-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 27ce75edc1..13dbe10cec 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 |