fix erroneous stop before input limit in mbsnrtowcs and wcsnrtombs

[musl] / src / stdio / fclose.c

diff --git a/src/stdio/fclose.c b/src/stdio/fclose.c
index 8fdc3f7..d687a87 100644 (file)
--- a/src/stdio/fclose.c
+++ b/src/stdio/fclose.c
@@ -1,16 +1,24 @@
 #include "stdio_impl.h"
+#include "libc.h"
+
+static void dummy(FILE *f) { }
+weak_alias(dummy, __unlist_locked_file);
 
 int fclose(FILE *f)
 {
        int r;
-       int perm = f->flags & F_PERM;
+       int perm;
+       
+       FLOCK(f);
+
+       __unlist_locked_file(f);
 
-       if (!perm) {
-               OFLLOCK();
+       if (!(perm = f->flags & F_PERM)) {
+               FILE **head = __ofl_lock();
                if (f->prev) f->prev->next = f->next;
                if (f->next) f->next->prev = f->prev;
-               if (libc.ofl_head == f) libc.ofl_head = f->next;
-               OFLUNLOCK();
+               if (*head == f) *head = f->next;
+               __ofl_unlock();
        }
 
        r = fflush(f);
@@ -18,6 +26,7 @@ int fclose(FILE *f)
 
        if (f->getln_buf) free(f->getln_buf);
        if (!perm) free(f);
-       
+       else FUNLOCK(f);
+
        return r;
 }