X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=src%2Fstdio%2Ffmemopen.c;h=d78496091d255a9d54d57ca0f075ce1c84e8487f;hb=c6d441e3a246370d9c459396ec22b096db93850e;hp=f518528fe2086ac2f563aeb7a4e81e5812e86913;hpb=d4fa6f0e08ff5a292d2aeeeeda80670a1a082cae;p=musl

diff --git a/src/stdio/fmemopen.c b/src/stdio/fmemopen.c
index f518528f..d7849609 100644
--- 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;
@@ -16,15 +19,19 @@ fail:
 		return -1;
 	}
 	base = (size_t [3]){0, c->pos, c->len}[whence];
-	if (off < -base || off > SSIZE_MAX-base) goto fail;
+	if (off < -base || off > (ssize_t)c->size-base) goto fail;
 	return c->pos = base+off;
 }
 
 static size_t mread(FILE *f, unsigned char *buf, size_t len)
 {
 	struct cookie *c = f->cookie;
-	size_t rem = c->size - c->pos;
-	if (len > rem) len = rem;
+	size_t rem = c->len - c->pos;
+	if (c->pos > c->len) rem = 0;
+	if (len > rem) {
+		len = rem;
+		f->flags |= F_EOF;
+	}
 	memcpy(buf, c->buf+c->pos, len);
 	c->pos += len;
 	rem -= len;
@@ -32,7 +39,7 @@ static size_t mread(FILE *f, unsigned char *buf, size_t len)
 	f->rpos = f->buf;
 	f->rend = f->buf + rem;
 	memcpy(f->rpos, c->buf+c->pos, rem);
-	if (!len) f->flags |= F_EOF;
+	c->pos += rem;
 	return len;
 }
 
@@ -45,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;
 }
 
@@ -60,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;
@@ -98,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;
 }