jyapayne/musl
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fmemopen: fix eof handling, hopefully right this time

Browse source
This commit is contained in:
Rich Felker 2011-09-04 16:06:38 -04:00
commit 22e4542348
1 changed files with 4 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

7
src/stdio/fmemopen.c
View file

@ -24,8 +24,10 @@ 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) {
if (len > rem) len = rem; len = rem;
f->flags |= F_EOF;
}
memcpy(buf, c->buf+c->pos, len); memcpy(buf, c->buf+c->pos, len);
c->pos += len; c->pos += len;
rem -= len; rem -= len;
@ -34,7 +36,6 @@ static size_t mread(FILE *f, unsigned char *buf, size_t len)
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; c->pos += rem;
if (!len) f->flags |= F_EOF;
return len; return len;
} }