X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=src%2Fstdio%2Fopen_wmemstream.c;h=4d90cd971964f5f91f6dca091e2f2a0d82d4b934;hb=5b5db97f7e80bde2678aed72336a28375e800354;hp=a830b143ebe95cbf6dc4b038bc44b7357b824841;hpb=7ee3dcb3c603b20fcd4547ffb00e11701c6d1cf4;p=musl diff --git a/src/stdio/open_wmemstream.c b/src/stdio/open_wmemstream.c index a830b143..4d90cd97 100644 --- a/src/stdio/open_wmemstream.c +++ b/src/stdio/open_wmemstream.c @@ -1,4 +1,8 @@ #include "stdio_impl.h" +#include +#include +#include +#include struct cookie { wchar_t **bufp; @@ -57,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; @@ -75,12 +86,7 @@ FILE *open_wmemstream(wchar_t **bufp, size_t *sizep) f->seek = wms_seek; f->close = wms_close; - if (!libc.threaded) { - f->lock = -1; - f->next = libc.ofl_head; - if (libc.ofl_head) libc.ofl_head->prev = f; - libc.ofl_head = f; - } + if (!libc.threaded) f->lock = -1; - return f; + return __ofl_add(f); }