fix memory leak due to double call to getaddrinfo in gethostbyname*

[musl] / src / stdio / fmemopen.c

diff --git a/src/stdio/fmemopen.c b/src/stdio/fmemopen.c
index e2adfb2..d784960 100644 (file)
--- a/src/stdio/fmemopen.c
+++ b/src/stdio/fmemopen.c
@@ -1,4 +1,7 @@
 #include "stdio_impl.h"
+#include <errno.h>
+#include <string.h>
+#include <inttypes.h>
 
 struct cookie {
        size_t pos, len, size;
@@ -23,7 +26,8 @@ fail:
 static size_t mread(FILE *f, unsigned char *buf, size_t len)
 {
        struct cookie *c = f->cookie;
-       size_t rem = c->size - c->pos;
+       size_t rem = c->len - c->pos;
+       if (c->pos > c->len) rem = 0;
        if (len > rem) {
                len = rem;
                f->flags |= F_EOF;
@@ -48,13 +52,16 @@ static size_t mwrite(FILE *f, const unsigned char *buf, size_t len)
                f->wpos = f->wbase;
                if (mwrite(f, f->wpos, len2) < len2) return 0;
        }
-       if (c->mode == 'a') c->pos = c->size;
+       if (c->mode == 'a') c->pos = c->len;
        rem = c->size - c->pos;
        if (len > rem) len = rem;
        memcpy(c->buf+c->pos, buf, len);
        c->pos += len;
-       if (c->pos >= c->len) c->len = c->pos;
-       c->buf[c->len==c->size ? c->len-1 : c->len] = 0;
+       if (c->pos > c->len) {
+               c->len = c->pos;
+               if (c->len < c->size) c->buf[c->len] = 0;
+               else if ((f->flags&F_NORD) && c->size) c->buf[c->size-1] = 0;
+       }
        return len;
 }
 
@@ -63,7 +70,7 @@ static int mclose(FILE *m)
        return 0;
 }
 
-FILE *fmemopen(void *buf, size_t size, const char *mode)
+FILE *fmemopen(void *restrict buf, size_t size, const char *restrict mode)
 {
        FILE *f;
        struct cookie *c;
@@ -101,12 +108,13 @@ FILE *fmemopen(void *buf, size_t size, const char *mode)
        f->seek = mseek;
        f->close = mclose;
 
-       if (!libc.threaded) {
-               f->lock = -1;
-               f->next = libc.ofl_head;
-               if (libc.ofl_head) libc.ofl_head->prev = f;
-               libc.ofl_head = f;
-       }
+       if (!libc.threaded) f->lock = -1;
+
+       OFLLOCK();
+       f->next = libc.ofl_head;
+       if (libc.ofl_head) libc.ofl_head->prev = f;
+       libc.ofl_head = f;
+       OFLUNLOCK();
 
        return f;
 }