projects
/
musl
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
improve the quality of output from rand_r
[musl]
/
src
/
stdio
/
open_wmemstream.c
diff --git
a/src/stdio/open_wmemstream.c
b/src/stdio/open_wmemstream.c
index
5402ca1
..
3537030
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;
@@
-14,22
+18,13
@@
static off_t wms_seek(FILE *f, off_t off, int whence)
{
ssize_t base;
struct cookie *c = f->cookie;
{
ssize_t base;
struct cookie *c = f->cookie;
- switch (whence) {
- case SEEK_SET:
- base = 0;
- break;
- case SEEK_CUR:
- base = c->pos;
- break;
- case SEEK_END:
- base = c->len;
- break;
- default:
- fail:
+ if (whence>2U) {
+fail:
errno = EINVAL;
return -1;
}
errno = EINVAL;
return -1;
}
- if (-off > base || off > SSIZE_MAX/4-base) goto fail;
+ base = (size_t [3]){0, c->pos, c->len}[whence];
+ if (off < -base || off > SSIZE_MAX/4-base) goto fail;
memset(&c->mbs, 0, sizeof c->mbs);
return c->pos = base+off;
}
memset(&c->mbs, 0, sizeof c->mbs);
return c->pos = base+off;
}
@@
-39,13
+34,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;
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;
*c->bufp = c->buf = newbuf;
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;
}
c->space = len2;
}
@@
-84,12
+79,13
@@
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;
+
+ OFLLOCK();
+ f->next = libc.ofl_head;
+ if (libc.ofl_head) libc.ofl_head->prev = f;
+ libc.ofl_head = f;
+ OFLUNLOCK();
return f;
}
return f;
}