summaryrefslogtreecommitdiff
path: root/src/stdio
diff options
context:
space:
mode:
authorRich Felker <dalias@aerifal.cx>2011-09-03 20:19:51 -0400
committerRich Felker <dalias@aerifal.cx>2011-09-03 20:19:51 -0400
commit1e6937643577e1fb5ea8696c2f583e20bcd29279 (patch)
tree02878c62981a4aa68b4f5fdcfe2c9cbdc261ac84 /src/stdio
parent1461e027579c16a6bd95a264d9a1db75a4c3fa74 (diff)
downloadmusl-1e6937643577e1fb5ea8696c2f583e20bcd29279.tar.gz
musl-1e6937643577e1fb5ea8696c2f583e20bcd29279.tar.bz2
musl-1e6937643577e1fb5ea8696c2f583e20bcd29279.tar.xz
musl-1e6937643577e1fb5ea8696c2f583e20bcd29279.zip
fix some length calculations in memory streams
Diffstat (limited to 'src/stdio')
-rw-r--r--src/stdio/open_memstream.c2
-rw-r--r--src/stdio/open_wmemstream.c4
2 files changed, 3 insertions, 3 deletions
diff --git a/src/stdio/open_memstream.c b/src/stdio/open_memstream.c
index dedc3d51..2f3569f1 100644
--- a/src/stdio/open_memstream.c
+++ b/src/stdio/open_memstream.c
@@ -41,7 +41,7 @@ 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) {
+ if (len >= c->space - c->pos) {
len2 = 2*c->space+1 | c->space+len+1;
newbuf = realloc(c->buf, len2);
if (!newbuf) return 0;
diff --git a/src/stdio/open_wmemstream.c b/src/stdio/open_wmemstream.c
index 5402ca1a..3bc0f254 100644
--- a/src/stdio/open_wmemstream.c
+++ b/src/stdio/open_wmemstream.c
@@ -39,13 +39,13 @@ static size_t wms_write(FILE *f, const unsigned char *buf, size_t len)
struct cookie *c = f->cookie;
size_t len2;
wchar_t *newbuf;
- if (len > c->space - c->pos) {
+ if (len >= c->space - c->pos) {
len2 = 2*c->space+1 | c->space+len+1;
if (len2 > SSIZE_MAX/4) return 0;
newbuf = realloc(c->buf, len2*4);
if (!newbuf) return 0;
*c->bufp = c->buf = newbuf;
- memset(c->buf + c->space, 0, len2 - c->space);
+ memset(c->buf + c->space, 0, 4*(len2 - c->space));
c->space = len2;
}