projects
/
musl
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
remove hand-written crt1.s and Scrt1.s files for all archs
[musl]
/
src
/
stdio
/
open_wmemstream.c
diff --git
a/src/stdio/open_wmemstream.c
b/src/stdio/open_wmemstream.c
index
0db7741
..
4d90cd9
100644
(file)
--- a/
src/stdio/open_wmemstream.c
+++ b/
src/stdio/open_wmemstream.c
@@
-1,4
+1,8
@@
#include "stdio_impl.h"
#include "stdio_impl.h"
+#include <wchar.h>
+#include <errno.h>
+#include <limits.h>
+#include <string.h>
struct cookie {
wchar_t **bufp;
struct cookie {
wchar_t **bufp;
@@
-30,8
+34,8
@@
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;
struct cookie *c = f->cookie;
size_t len2;
wchar_t *newbuf;
- if (len
>= c->space - c->pos
) {
- len2 = 2*c->space+1 | c->
space
+len+1;
+ if (len
+ c->pos >= c->space
) {
+ len2 = 2*c->space+1 | c->
pos
+len+1;
if (len2 > SSIZE_MAX/4) return 0;
newbuf = realloc(c->buf, len2*4);
if (!newbuf) return 0;
if (len2 > SSIZE_MAX/4) return 0;
newbuf = realloc(c->buf, len2*4);
if (!newbuf) return 0;
@@
-57,14
+61,21
@@
FILE *open_wmemstream(wchar_t **bufp, size_t *sizep)
{
FILE *f;
struct cookie *c;
{
FILE *f;
struct cookie *c;
+ wchar_t *buf;
+
if (!(f=malloc(sizeof *f + sizeof *c))) return 0;
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;
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;
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;
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)
;
}
}