2014-12-02 Joseph Myers <joseph@codesourcery.com>
+ [BZ #17664]
+ * misc/mntent_r.c (__getmntent_r): Use __fgets_unlocked instead of
+ fgets_unlocked.
+ * resolv/res_hconf.c [IS_IN (libc)] (fgets_unlocked): Define to
+ __fgets_unlocked.
+ * resolv/res_init.c (__res_vinit): Use __fgets_unlocked instead of
+ fgets_unlocked.
+ * conform/Makefile (test-xfail-XPG4/sys/statvfs.h/linknamespace):
+ Remove variable.
+ (test-xfail-POSIX/sys/mman.h/linknamespace): Likewise.
+ (test-xfail-UNIX98/sys/mman.h/linknamespace): Likewise.
+ (test-xfail-UNIX98/sys/statvfs.h/linknamespace): Likewise.
+ (test-xfail-XOPEN2K/sys/mman.h/linknamespace): Likewise.
+ (test-xfail-XOPEN2K/sys/statvfs.h/linknamespace): Likewise.
+ (test-xfail-POSIX2008/sys/mman.h/linknamespace): Likewise.
+ (test-xfail-POSIX2008/sys/statvfs.h/linknamespace): Likewise.
+ (test-xfail-XOPEN2K8/sys/mman.h/linknamespace): Likewise.
+ (test-xfail-XOPEN2K8/sys/statvfs.h/linknamespace): Likewise.
+
* elf/tst-unique4lib.cc (b): Mark with __attribute__ ((used)).
2014-12-02 Adhemerval Zanella <azanella@linux.vnet.ibm.com>
16619, 16740, 16857, 17192, 17266, 17344, 17363, 17370, 17371, 17411,
17460, 17475, 17485, 17501, 17506, 17508, 17522, 17555, 17570, 17571,
17572, 17573, 17574, 17581, 17582, 17583, 17584, 17585, 17589, 17594,
- 17608, 17616, 17625, 17633.
+ 17608, 17616, 17625, 17633, 17664.
* CVE-2104-7817 The wordexp function could ignore the WRDE_NOCMD flag
under certain input conditions resulting in the execution of a shell for
test-xfail-XPG4/search.h/linknamespace = yes
test-xfail-XPG4/stdio.h/linknamespace = yes
test-xfail-XPG4/stdlib.h/linknamespace = yes
-test-xfail-XPG4/sys/statvfs.h/linknamespace = yes
test-xfail-XPG4/syslog.h/linknamespace = yes
test-xfail-XPG4/time.h/linknamespace = yes
test-xfail-XPG4/unistd.h/linknamespace = yes
test-xfail-POSIX/regex.h/linknamespace = yes
test-xfail-POSIX/sched.h/linknamespace = yes
test-xfail-POSIX/semaphore.h/linknamespace = yes
-test-xfail-POSIX/sys/mman.h/linknamespace = yes
test-xfail-POSIX/time.h/linknamespace = yes
test-xfail-POSIX/unistd.h/linknamespace = yes
test-xfail-POSIX/wordexp.h/linknamespace = yes
test-xfail-UNIX98/semaphore.h/linknamespace = yes
test-xfail-UNIX98/stdio.h/linknamespace = yes
test-xfail-UNIX98/stdlib.h/linknamespace = yes
-test-xfail-UNIX98/sys/mman.h/linknamespace = yes
-test-xfail-UNIX98/sys/statvfs.h/linknamespace = yes
test-xfail-UNIX98/syslog.h/linknamespace = yes
test-xfail-UNIX98/time.h/linknamespace = yes
test-xfail-UNIX98/unistd.h/linknamespace = yes
test-xfail-XOPEN2K/signal.h/linknamespace = yes
test-xfail-XOPEN2K/spawn.h/linknamespace = yes
test-xfail-XOPEN2K/stdlib.h/linknamespace = yes
-test-xfail-XOPEN2K/sys/mman.h/linknamespace = yes
-test-xfail-XOPEN2K/sys/statvfs.h/linknamespace = yes
test-xfail-XOPEN2K/sys/wait.h/linknamespace = yes
test-xfail-XOPEN2K/syslog.h/linknamespace = yes
test-xfail-XOPEN2K/time.h/linknamespace = yes
test-xfail-POSIX2008/regex.h/linknamespace = yes
test-xfail-POSIX2008/semaphore.h/linknamespace = yes
test-xfail-POSIX2008/spawn.h/linknamespace = yes
-test-xfail-POSIX2008/sys/mman.h/linknamespace = yes
-test-xfail-POSIX2008/sys/statvfs.h/linknamespace = yes
test-xfail-POSIX2008/time.h/linknamespace = yes
test-xfail-POSIX2008/unistd.h/linknamespace = yes
test-xfail-XOPEN2K8/aio.h/linknamespace = yes
test-xfail-XOPEN2K8/search.h/linknamespace = yes
test-xfail-XOPEN2K8/semaphore.h/linknamespace = yes
test-xfail-XOPEN2K8/spawn.h/linknamespace = yes
-test-xfail-XOPEN2K8/sys/mman.h/linknamespace = yes
-test-xfail-XOPEN2K8/sys/statvfs.h/linknamespace = yes
test-xfail-XOPEN2K8/syslog.h/linknamespace = yes
test-xfail-XOPEN2K8/time.h/linknamespace = yes
test-xfail-XOPEN2K8/unistd.h/linknamespace = yes
{
char *end_ptr;
- if (fgets_unlocked (buffer, bufsiz, stream) == NULL)
+ if (__fgets_unlocked (buffer, bufsiz, stream) == NULL)
{
funlockfile (stream);
return NULL;
{
/* Not the whole line was read. Do it now but forget it. */
char tmp[1024];
- while (fgets_unlocked (tmp, sizeof tmp, stream) != NULL)
+ while (__fgets_unlocked (tmp, sizeof tmp, stream) != NULL)
if (strchr (tmp, '\n') != NULL)
break;
}
#include "res_hconf.h"
#include <wchar.h>
+#if IS_IN (libc)
+# define fgets_unlocked __fgets_unlocked
+#endif
+
#define _PATH_HOSTCONF "/etc/host.conf"
/* Environment vars that all user to override default behavior: */
/* No threads use this stream. */
__fsetlocking (fp, FSETLOCKING_BYCALLER);
/* read the config file */
- while (fgets_unlocked(buf, sizeof(buf), fp) != NULL) {
+ while (__fgets_unlocked(buf, sizeof(buf), fp) != NULL) {
/* skip comments */
if (*buf == ';' || *buf == '#')
continue;