openrc-shutdown: broadcast: avoid double close

Initialize fd and tp to known invalid values, and reset them after calling close/fclose. Bug: https://bugs.gentoo.org/923326 Signed-off-by: Mike Gilbert <[email protected]>
OpenRC · May 21, 2024 · eddb17b · eddb17b
1 parent 3d30b6f
commit eddb17b
Showing 1 changed file with 10 additions and 5 deletions.
diff --git a/src/openrc-shutdown/broadcast.c b/src/openrc-shutdown/broadcast.c
@@ -131,8 +131,8 @@ void broadcast(char *text)
 	 * These are set across the sigsetjmp call, so they can't be stored on
 	 * the stack, otherwise they might be clobbered.
 	 */
-	static int fd;
-	static FILE *tp;
+	static int fd = -1;
+	static FILE *tp = NULL;
 
 	getuidtty(&user, &tty);
 
@@ -193,10 +193,15 @@ void broadcast(char *text)
 			}
 		}
 		alarm(0);
-		if (fd >= 0)
-			close(fd);
-		if (tp != NULL)
+		if (tp != NULL) {
 			fclose(tp);
+			tp = NULL;
+			fd = -1; /* fclose will call close for us */
+		}
+		if (fd >= 0) {
+			close(fd);
+			fd = -1;
+		}
 		free(term);
 	}
 	endutxent();