projects
/
musl
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fix regression in dynamic-linked tls when both main app & libs have tls
[musl]
/
src
/
temp
/
mkostemps.c
diff --git
a/src/temp/mkostemps.c
b/src/temp/mkostemps.c
index
804a547
..
512b5f1
100644
(file)
--- a/
src/temp/mkostemps.c
+++ b/
src/temp/mkostemps.c
@@
-9,22
+9,21
@@
char *__randname(char *);
int __mkostemps(char *template, int len, int flags)
{
int __mkostemps(char *template, int len, int flags)
{
- if (len < 0) return EINVAL;
-
- size_t l = strlen(template)-len;
- if (l < 6 || strncmp(template+l-6, "XXXXXX", 6)) {
+ size_t l = strlen(template);
+ if (l<6 || len>l-6 || memcmp(template+l-len-6, "XXXXXX", 6)) {
errno = EINVAL;
errno = EINVAL;
- *template = 0;
return -1;
}
return -1;
}
+ flags -= flags & O_ACCMODE;
int fd, retries = 100;
int fd, retries = 100;
-
while (retries--)
{
- __randname(template+l-6);
+
do
{
+ __randname(template+l-
len-
6);
if ((fd = open(template, flags | O_RDWR | O_CREAT | O_EXCL, 0600))>=0)
return fd;
if ((fd = open(template, flags | O_RDWR | O_CREAT | O_EXCL, 0600))>=0)
return fd;
- if (errno != EEXIST) return -1;
- }
+ } while (--retries && errno == EEXIST);
+
+ memcpy(template+l-len-6, "XXXXXX", 6);
return -1;
}
return -1;
}