fix potential deadlock in dlerror buffer handling at thread exit

[musl] / src / stdio / setvbuf.c

diff --git a/src/stdio/setvbuf.c b/src/stdio/setvbuf.c
index 2985d3f..523dddc 100644 (file)
--- a/src/stdio/setvbuf.c
+++ b/src/stdio/setvbuf.c
@@ -1,22 +1,29 @@
 #include "stdio_impl.h"
 
-/* This function makes no attempt to protect the user from his/her own
- * stupidity. If called any time but when then ISO C standard specifically
- * allows it, all hell can and will break loose, especially with threads!
- *
- * This implementation ignores all arguments except the buffering type,
- * and uses the existing buffer allocated alongside the FILE object.
- * In the case of stderr where the preexisting buffer is length 1, it
- * is not possible to set line buffering or full buffering. */
+/* The behavior of this function is undefined except when it is the first
+ * operation on the stream, so the presence or absence of locking is not
+ * observable in a program whose behavior is defined. Thus no locking is
+ * performed here. No allocation of buffers is performed, but a buffer
+ * provided by the caller is used as long as it is suitably sized. */
 
-int setvbuf(FILE *f, char *buf, int type, size_t size)
+int setvbuf(FILE *restrict f, char *restrict buf, int type, size_t size)
 {
        f->lbf = EOF;
 
-       if (type == _IONBF)
-               f->buf_size = 1;
-       else if (type == _IOLBF)
-               f->lbf = '\n';
+       if (type == _IONBF) {
+               f->buf_size = 0;
+       } else if (type == _IOLBF || type == _IOFBF) {
+               if (buf && size >= UNGET) {
+                       f->buf = (void *)(buf + UNGET);
+                       f->buf_size = size - UNGET;
+               }
+               if (type == _IOLBF && f->buf_size)
+                       f->lbf = '\n';
+       } else {
+               return -1;
+       }
+
+       f->flags |= F_SVB;
 
        return 0;
 }