X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=src%2Fstdio%2Ffclose.c;h=d594532bd64fdb5695544d67ee4dababd4c9a214;hb=42aa19a0fefc5c38f6e00734afae80d42ab3bd48;hp=38e8a1e39dae99255328d97150180652afde9fb2;hpb=a617a8e2adaaac41dd1b662b6646e8392465801c;p=musl

diff --git a/src/stdio/fclose.c b/src/stdio/fclose.c
index 38e8a1e3..d594532b 100644
--- a/src/stdio/fclose.c
+++ b/src/stdio/fclose.c
@@ -1,25 +1,38 @@
 #include "stdio_impl.h"
+#include <stdlib.h>
+
+static void dummy(FILE *f) { }
+weak_alias(dummy, __unlist_locked_file);
 
 int fclose(FILE *f)
 {
 	int r;
-	int perm;
 	
-	FFINALLOCK(f);
-
-	if (!(perm = f->flags & F_PERM)) {
-		OFLLOCK();
-		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();
-	}
-
+	FLOCK(f);
 	r = fflush(f);
 	r |= f->close(f);
+	FUNLOCK(f);
+
+	/* Past this point, f is closed and any further explict access
+	 * to it is undefined. However, it still exists as an entry in
+	 * the open file list and possibly in the thread's locked files
+	 * list, if it was closed while explicitly locked. Functions
+	 * which process these lists must tolerate dead FILE objects
+	 * (which necessarily have inactive buffer pointers) without
+	 * producing any side effects. */
+
+	if (f->flags & F_PERM) return r;
+
+	__unlist_locked_file(f);
+
+	FILE **head = __ofl_lock();
+	if (f->prev) f->prev->next = f->next;
+	if (f->next) f->next->prev = f->prev;
+	if (*head == f) *head = f->next;
+	__ofl_unlock();
+
+	free(f->getln_buf);
+	free(f);
 
-	if (f->getln_buf) free(f->getln_buf);
-	if (!perm) free(f);
-	
 	return r;
 }