fix uninitialized/stale use of alloc (%m modifier) flag in scanf

[musl] / src / stdio / __stdio_read.c

diff --git a/src/stdio/__stdio_read.c b/src/stdio/__stdio_read.c
index ee17a57..05e56f9 100644 (file)
--- a/src/stdio/__stdio_read.c
+++ b/src/stdio/__stdio_read.c
@@ -1,4 +1,5 @@
 #include "stdio_impl.h"
+#include <sys/uio.h>
 #include <pthread.h>
 
 static void cleanup(void *p)
@@ -15,9 +16,13 @@ size_t __stdio_read(FILE *f, unsigned char *buf, size_t len)
        };
        ssize_t cnt;
 
-       pthread_cleanup_push(cleanup, f);
-       cnt = syscall_cp(SYS_readv, f->fd, iov, 2);
-       pthread_cleanup_pop(0);
+       if (libc.main_thread) {
+               pthread_cleanup_push(cleanup, f);
+               cnt = syscall_cp(SYS_readv, f->fd, iov, 2);
+               pthread_cleanup_pop(0);
+       } else {
+               cnt = syscall(SYS_readv, f->fd, iov, 2);
+       }
        if (cnt <= 0) {
                f->flags |= F_EOF ^ ((F_ERR^F_EOF) & cnt);
                f->rpos = f->rend = 0;