Browse Source

fmemopen fixes

disallow seek past end of buffer (per posix)
fix position accounting to include data buffered for read
don't set eof flag when no data was requested
Rich Felker 13 years ago
parent
commit
f81279ff58
1 changed files with 3 additions and 1 deletions
  1. 3 1
      src/stdio/fmemopen.c

+ 3 - 1
src/stdio/fmemopen.c

@@ -16,7 +16,7 @@ fail:
 		return -1;
 		return -1;
 	}
 	}
 	base = (size_t [3]){0, c->pos, c->len}[whence];
 	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;
 	return c->pos = base+off;
 }
 }
 
 
@@ -24,6 +24,7 @@ static size_t mread(FILE *f, unsigned char *buf, size_t len)
 {
 {
 	struct cookie *c = f->cookie;
 	struct cookie *c = f->cookie;
 	size_t rem = c->size - c->pos;
 	size_t rem = c->size - c->pos;
+	if (!len) return 0;
 	if (len > rem) len = rem;
 	if (len > rem) len = rem;
 	memcpy(buf, c->buf+c->pos, len);
 	memcpy(buf, c->buf+c->pos, len);
 	c->pos += len;
 	c->pos += len;
@@ -32,6 +33,7 @@ static size_t mread(FILE *f, unsigned char *buf, size_t len)
 	f->rpos = f->buf;
 	f->rpos = f->buf;
 	f->rend = f->buf + rem;
 	f->rend = f->buf + rem;
 	memcpy(f->rpos, c->buf+c->pos, rem);
 	memcpy(f->rpos, c->buf+c->pos, rem);
+	c->pos += rem;
 	if (!len) f->flags |= F_EOF;
 	if (!len) f->flags |= F_EOF;
 	return len;
 	return len;
 }
 }