X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=src%2Fstdio%2Ffmemopen.c;h=770fd9953a63274cea74a24a4b1a7dd391c33824;hb=5271ff46b9e983bec5fd9ab79d5aaf096fa54157;hp=260d2889ebf549989d59e497b396653972ae15aa;hpb=e72ee5786b1f328da131b87388333c2e3a09b7b3;p=musl

diff --git a/src/stdio/fmemopen.c b/src/stdio/fmemopen.c
index 260d2889..770fd995 100644
--- a/src/stdio/fmemopen.c
+++ b/src/stdio/fmemopen.c
@@ -54,9 +54,10 @@ static size_t mwrite(FILE *f, const unsigned char *buf, size_t len)
 	if (len > rem) len = rem;
 	memcpy(c->buf+c->pos, buf, len);
 	c->pos += len;
-	if (c->pos >= c->len) {
+	if (c->pos > c->len) {
 		c->len = c->pos;
-		c->buf[c->len==c->size ? c->len-1 : c->len] = 0;
+		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;
 }
@@ -66,7 +67,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;