fix open_[w]memstream behavior when no writes take place

the specification for these functions requires that the buffer/size
exposed to the caller be valid after any successful call to fflush or
fclose on the stream. the implementation's approach is to update them
only at flush time, but that misses the case where fflush or fclose is
called without any writes having taken place, in which case the write
flushing callback will not be called.

to fix both the observable bug and the desired invariant, setup empty
buffers at open time and fail the open operation if no memory is
available.

diff --git a/src/stdio/open_memstream.c b/src/stdio/open_memstream.c
index 58504c9f5ee3410ee8ea9222450339a3cac87dbc..eab024da6cd1766a08f1f54e60aa763730b1a6c8 100644 (file)
--- a/src/stdio/open_memstream.c
+++ b/src/stdio/open_memstream.c
@@ -59,14 +59,21 @@ FILE *open_memstream(char **bufp, size_t *sizep)
 {
        FILE *f;
        struct cookie *c;
+       char *buf;
+
        if (!(f=malloc(sizeof *f + sizeof *c + BUFSIZ))) return 0;
+       if (!(buf=malloc(sizeof *buf))) {
+               free(f);
+               return 0;
+       }
        memset(f, 0, sizeof *f + sizeof *c);
        f->cookie = c = (void *)(f+1);
 
        c->bufp = bufp;
        c->sizep = sizep;
-       c->pos = c->len = c->space = 0;
-       c->buf = 0;
+       c->pos = c->len = c->space = *sizep = 0;
+       c->buf = *bufp = buf;
+       *buf = 0;
 
        f->flags = F_NORD;
        f->fd = -1;

diff --git a/src/stdio/open_wmemstream.c b/src/stdio/open_wmemstream.c
index 7ab2c64364e01d310d0c868b40837537af5800fd..4d90cd971964f5f91f6dca091e2f2a0d82d4b934 100644 (file)
--- a/src/stdio/open_wmemstream.c
+++ b/src/stdio/open_wmemstream.c
@@ -61,14 +61,21 @@ FILE *open_wmemstream(wchar_t **bufp, size_t *sizep)
 {
        FILE *f;
        struct cookie *c;
+       wchar_t *buf;
+
        if (!(f=malloc(sizeof *f + sizeof *c))) return 0;
+       if (!(buf=malloc(sizeof *buf))) {
+               free(f);
+               return 0;
+       }
        memset(f, 0, sizeof *f + sizeof *c);
        f->cookie = c = (void *)(f+1);
 
        c->bufp = bufp;
        c->sizep = sizep;
-       c->pos = c->len = c->space = 0;
-       c->buf = 0;
+       c->pos = c->len = c->space = *sizep = 0;
+       c->buf = *bufp = buf;
+       *buf = 0;
 
        f->flags = F_NORD;
        f->fd = -1;