aboutsummaryrefslogtreecommitdiff
path: root/nscd
diff options
context:
space:
mode:
authorJoseph Myers <joseph@codesourcery.com>2014-11-12 22:33:41 +0000
committerJoseph Myers <joseph@codesourcery.com>2014-11-12 22:33:41 +0000
commitbef8fd6013f7d398661077340753c745a8939279 (patch)
tree1cd588148b457edb6d8f8d4955ccefb0f0c0125c /nscd
parentc52ff39e8ee052e4a57676d65a27f09bd0a859ad (diff)
downloadglibc-bef8fd6013f7d398661077340753c745a8939279.tar
glibc-bef8fd6013f7d398661077340753c745a8939279.tar.gz
glibc-bef8fd6013f7d398661077340753c745a8939279.tar.bz2
glibc-bef8fd6013f7d398661077340753c745a8939279.zip
Fix qsort_r namespace (bug 17571).
qsort_r is defined in the same file as qsort, but is not an ISO C function, so should be a weak alias for __qsort_r. The uses in getaddrinfo should also call __qsort_r, since getaddrinfo is a POSIX function and qsort_r isn't. This patch implements this. Because nscd uses the getaddrinfo sources outside libc, as do the tst-rfc3484 tests, a #define of __qsort_r to qsort_r is added there alongside the similar defines for other libc-internal symbols used in getaddrinfo. Tested for x86_64 (testsuite, and that disassembly of installed shared libraries is unchanged by the patch). [BZ #17571] * stdlib/msort.c (qsort_r): Rename to __qsort_r and define as weak alias of __qsort_r. (qsort): Call __qsort_r instead of qsort_r. * include/stdlib.h (qsort_r): Do not call libc_hidden_proto. (__qsort_r): Declare. Call libc_hidden_proto. * sysdeps/posix/getaddrinfo.c (getaddrinfo): Call __qsort_r instead of qsort_r. * nscd/gai.c (__qsort_r): Define to qsort_r. * posix/tst-rfc3484.c (__qsort_r): Likewise. * posix/tst-rfc3484-2.c (__qsort_r): Likewise. * posix/tst-rfc3484-3.c (__qsort_r): Likewise.
Diffstat (limited to 'nscd')
-rw-r--r--nscd/gai.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/nscd/gai.c b/nscd/gai.c
index 95373e4ecb..c159c0bee2 100644
--- a/nscd/gai.c
+++ b/nscd/gai.c
@@ -28,6 +28,7 @@
#define __sendto sendto
#define __strchrnul strchrnul
#define __getline getline
+#define __qsort_r qsort_r
/* nscd uses 1MB or 2MB thread stacks. */
#define __libc_use_alloca(size) (size <= __MAX_ALLOCA_CUTOFF)