X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=src%2Fstdio%2Fopen_memstream.c;h=687e818dbd5cc857acb98e30d126889f297478c0;hb=a749ba3adc2f3b4abfc68b21d4c3741b20c8f657;hp=2f3569f1d177211962558b8810837e0229ff7eea;hpb=1e6937643577e1fb5ea8696c2f583e20bcd29279;p=musl

diff --git a/src/stdio/open_memstream.c b/src/stdio/open_memstream.c
index 2f3569f1..687e818d 100644
--- a/src/stdio/open_memstream.c
+++ b/src/stdio/open_memstream.c
@@ -13,22 +13,13 @@ static off_t ms_seek(FILE *f, off_t off, int whence)
 {
 	ssize_t base;
 	struct cookie *c = f->cookie;
-	switch (whence) {
-	case SEEK_SET:
-		base = 0;
-		break;
-	case SEEK_CUR:
-		base = c->pos;
-		break;
-	case SEEK_END:
-		base = c->len;
-		break;
-	default:
-	fail:
+	if (whence>2U) {
+fail:
 		errno = EINVAL;
 		return -1;
 	}
-	if (-off > base || off > SSIZE_MAX-base) goto fail;
+	base = (size_t [3]){0, c->pos, c->len}[whence];
+	if (off < -base || off > SSIZE_MAX-base) goto fail;
 	return c->pos = base+off;
 }
 
@@ -41,8 +32,8 @@ static size_t ms_write(FILE *f, const unsigned char *buf, size_t len)
 		f->wpos = f->wbase;
 		if (ms_write(f, f->wbase, len2) < len2) return 0;
 	}
-	if (len >= c->space - c->pos) {
-		len2 = 2*c->space+1 | c->space+len+1;
+	if (len + c->pos >= c->space) {
+		len2 = 2*c->space+1 | c->pos+len+1;
 		newbuf = realloc(c->buf, len2);
 		if (!newbuf) return 0;
 		*c->bufp = c->buf = newbuf;