jyapayne/musl
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix bogus lazy allocation in ctermid and missing malloc failure check

Browse source 
also clean up, optimize, and simplify the code, removing branches by
simply pre-setting the result string to an empty string, which will be
preserved if other operations fail.
This commit is contained in:
Rich Felker 2013-07-09 00:50:11 -04:00
commit b6218764eb
1 changed files with 7 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

17
src/unistd/ctermid.c
View file

@ -8,17 +8,14 @@
char *ctermid(char *s)
{
static char *s2;
static char s2[L_ctermid];
int fd;
if (!s) {
if (!s2) s2 = malloc(L_ctermid);
s = s2;
}
if (!s) s = s2;
*s = 0;
fd = open("/dev/tty", O_WRONLY | O_NOCTTY | O_CLOEXEC);
if (fd < 0)
return strcpy(s, "");
if (ttyname_r(fd, s, L_ctermid))
strcpy(s, "");
__syscall(SYS_close, fd);
if (fd >= 0) {
ttyname_r(fd, s, L_ctermid);
__syscall(SYS_close, fd);
}
return s;
}