projects
/
musl
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
prevent passing PT_INTERP name to dlopen from double-loading libc
[musl]
/
src
/
stdio
/
fmemopen.c
diff --git
a/src/stdio/fmemopen.c
b/src/stdio/fmemopen.c
index
260d288
..
d784960
100644
(file)
--- a/
src/stdio/fmemopen.c
+++ b/
src/stdio/fmemopen.c
@@
-1,4
+1,7
@@
#include "stdio_impl.h"
#include "stdio_impl.h"
+#include <errno.h>
+#include <string.h>
+#include <inttypes.h>
struct cookie {
size_t pos, len, size;
struct cookie {
size_t pos, len, size;
@@
-54,9
+57,10
@@
static size_t mwrite(FILE *f, const unsigned char *buf, size_t len)
if (len > rem) len = rem;
memcpy(c->buf+c->pos, buf, len);
c->pos += len;
if (len > rem) len = rem;
memcpy(c->buf+c->pos, buf, len);
c->pos += len;
- if (c->pos >
=
c->len) {
+ if (c->pos > c->len) {
c->len = c->pos;
c->len = c->pos;
- c->buf[c->len==c->size ? c->len-1 : c->len] = 0;
+ if (c->len < c->size) c->buf[c->len] = 0;
+ else if ((f->flags&F_NORD) && c->size) c->buf[c->size-1] = 0;
}
return len;
}
}
return len;
}
@@
-66,7
+70,7
@@
static int mclose(FILE *m)
return 0;
}
return 0;
}
-FILE *fmemopen(void *
buf, size_t size, const char *
mode)
+FILE *fmemopen(void *
restrict buf, size_t size, const char *restrict
mode)
{
FILE *f;
struct cookie *c;
{
FILE *f;
struct cookie *c;
@@
-104,12
+108,13
@@
FILE *fmemopen(void *buf, size_t size, const char *mode)
f->seek = mseek;
f->close = mclose;
f->seek = mseek;
f->close = mclose;
- 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;
}