From 5484f308b9aa53ab9c13d670d84a7fc35d447c1a Mon Sep 17 00:00:00 2001
From: Ian Fan <ianfan0@gmail.com>
Date: Thu, 14 Feb 2019 15:43:34 +0000
Subject: swaybar: prevent signal handler from firing during termination

This prevents a heap-use-after-free crash when sway terminates.
---
 swaybar/bar.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'swaybar/bar.c')

diff --git a/swaybar/bar.c b/swaybar/bar.c
index a1f7bfdb..db1c1222 100644
--- a/swaybar/bar.c
+++ b/swaybar/bar.c
@@ -4,6 +4,7 @@
 #include <fcntl.h>
 #include <poll.h>
 #include <signal.h>
+#include <stdbool.h>
 #include <stdlib.h>
 #include <string.h>
 #include <sys/wait.h>
@@ -403,8 +404,7 @@ bool bar_setup(struct swaybar *bar, const char *socket_path) {
 static void display_in(int fd, short mask, void *data) {
 	struct swaybar *bar = data;
 	if (wl_display_dispatch(bar->display) == -1) {
-		bar_teardown(bar);
-		exit(0);
+		bar->running = false;
 	}
 }
 
@@ -439,7 +439,7 @@ void bar_run(struct swaybar *bar) {
 		loop_add_fd(bar->eventloop, bar->tray->fd, POLLIN, tray_in, bar->tray->bus);
 	}
 #endif
-	while (1) {
+	while (bar->running) {
 		errno = 0;
 		if (wl_display_flush(bar->display) == -1 && errno != EAGAIN) {
 			break;
-- 
cgit v1.2.3