RepoMirrors
/
musl
mirror of git://git.musl-libc.org/musl
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix error cases in mkostemps core 

1. wrong return value and missing errno for negative suffix len
2. failure to catch suffix len > strlen
3. remove unwanted clearing of input string in invalid case
This commit is contained in:
Rich Felker 2013-02-20 22:58:46 -05:00
parent 3b00675bf5
commit 8d2f8064aa
1 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/temp/mkostemps.c
View File

@ -9,18 +9,15 @@ 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);
if (l<6 || len>l-6 || strncmp(template+l-len-6, "XXXXXX", 6)) {
size_t l = strlen(template)-len;
if (l < 6 || strncmp(template+l-6, "XXXXXX", 6)) {
errno = EINVAL; errno = EINVAL;
*template = 0;
return -1; return -1;
} }
int fd, retries = 100; int fd, retries = 100;
while (retries--) { while (retries--) {
__randname(template+l-6); __randname(template+l-len-6);
if ((fd = open(template, flags | O_RDWR | O_CREAT | O_EXCL, 0600))>=0) if ((fd = open(template, flags | O_RDWR | O_CREAT | O_EXCL, 0600))>=0)
return fd; return fd;
if (errno != EEXIST) return -1; if (errno != EEXIST) return -1;