Selaa lähdekoodia

fix bogus lazy allocation in ctermid and missing malloc failure check

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.
Rich Felker 11 vuotta sitten
vanhempi
sitoutus
b6218764eb
1 muutettua tiedostoa jossa 7 lisäystä ja 10 poistoa
  1. 7 10
      src/unistd/ctermid.c

+ 7 - 10
src/unistd/ctermid.c

@@ -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;
 }