From eb1fae6a450b3cce5a75c1ed1a734520c56a6457 Mon Sep 17 00:00:00 2001 From: Joseph Myers Date: Wed, 17 Jun 2015 20:14:18 +0000 Subject: Fix getpass fflush_unlocked namespace (bug 18540). The getpass function (XPG3 / XPG4 / UNIX98) calls fflush_unlocked (not in any of those standards). This patch fixes this by making fflush_unlocked into a weak alias for __fflush_unlocked and calling __fflush_unlocked from getpass. Tested for x86_64 and x86 (testsuite, and that disassembly of installed stripped shared libraries is unchanged by the patch). [BZ #18540] * libio/iofflush.c [!_IO_MTSAFE_IO] (__fflush_unlocked): Define as strong alias of _IO_fflush. Use libc_hidden_def. * libio/iofflush_u.c (fflush_unlocked): Rename to __fflush_unlocked and define as weak alias of __fflush_unlocked. Use libc_hidden_weak. * include/stdio.h (__fflush_unlocked): Declare. Use libc_hidden_proto. * misc/getpass.c (getpass): Call __fflush_unlocked instead of fflush_unlocked. * conform/Makefile (test-xfail-UNIX98/unistd.h/linknamespace): Remove variable. --- libio/iofflush.c | 2 ++ libio/iofflush_u.c | 6 ++++-- 2 files changed, 6 insertions(+), 2 deletions(-) (limited to 'libio') diff --git a/libio/iofflush.c b/libio/iofflush.c index 106f55f..236e145 100644 --- a/libio/iofflush.c +++ b/libio/iofflush.c @@ -50,6 +50,8 @@ weak_alias (_IO_fflush, fflush) libc_hidden_weak (fflush) #ifndef _IO_MTSAFE_IO +strong_alias (_IO_fflush, __fflush_unlocked) +libc_hidden_def (__fflush_unlocked) weak_alias (_IO_fflush, fflush_unlocked) libc_hidden_weak (fflush_unlocked) #endif diff --git a/libio/iofflush_u.c b/libio/iofflush_u.c index 6cc325a..e004479 100644 --- a/libio/iofflush_u.c +++ b/libio/iofflush_u.c @@ -28,7 +28,7 @@ #include int -fflush_unlocked (fp) +__fflush_unlocked (fp) _IO_FILE *fp; { if (fp == NULL) @@ -39,4 +39,6 @@ fflush_unlocked (fp) return _IO_SYNC (fp) ? EOF : 0; } } -libc_hidden_def (fflush_unlocked) +libc_hidden_def (__fflush_unlocked) +weak_alias (__fflush_unlocked, fflush_unlocked) +libc_hidden_weak (fflush_unlocked) -- cgit v1.1