mirrors/sway
1
0
Fork 0
mirror of https://github.com/swaywm/sway.git synced 2024-11-23 00:11:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

swaybar: prevent signal handler from firing during termination

Browse source 
This prevents a heap-use-after-free crash when sway terminates.
This commit is contained in:
Ian Fan 2019-02-14 15:43:34 +00:00 committed by Drew DeVault
parent 8d708b8e1d
commit 47abc45e86
3 changed files with 10 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
include/swaybar/bar.h
View file

@ -46,6 +46,8 @@ struct swaybar {
#if HAVE_TRAY #if HAVE_TRAY
struct swaybar_tray *tray; struct swaybar_tray *tray;
#endif #endif
bool running;
}; };
struct swaybar_output { struct swaybar_output {

6
swaybar/bar.c
View file

@ -4,6 +4,7 @@
#include <fcntl.h> #include <fcntl.h>
#include <poll.h> #include <poll.h>
#include <signal.h> #include <signal.h>
#include <stdbool.h>
#include <stdlib.h> #include <stdlib.h>
#include <string.h> #include <string.h>
#include <sys/wait.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) { static void display_in(int fd, short mask, void *data) {
struct swaybar *bar = data; struct swaybar *bar = data;
if (wl_display_dispatch(bar->display) == -1) { if (wl_display_dispatch(bar->display) == -1) {
bar_teardown(bar); bar->running = false;
exit(0);
} }
} }
@ -439,7 +439,7 @@ void bar_run(struct swaybar *bar) {
loop_add_fd(bar->eventloop, bar->tray->fd, POLLIN, tray_in, bar->tray->bus); loop_add_fd(bar->eventloop, bar->tray->fd, POLLIN, tray_in, bar->tray->bus);
} }
#endif #endif
while (1) { while (bar->running) {
errno = 0; errno = 0;
if (wl_display_flush(bar->display) == -1 && errno != EAGAIN) { if (wl_display_flush(bar->display) == -1 && errno != EAGAIN) {
break; break;

14
swaybar/main.c
View file

@ -11,13 +11,7 @@
static struct swaybar swaybar; static struct swaybar swaybar;
void sig_handler(int signal) { void sig_handler(int signal) {
bar_teardown(&swaybar); swaybar.running = false;
exit(0);
}
void sway_terminate(int code) {
bar_teardown(&swaybar);
exit(code);
} }
int main(int argc, char **argv) { int main(int argc, char **argv) {
@ -93,8 +87,6 @@ int main(int argc, char **argv) {
} }
} }
signal(SIGTERM, sig_handler);
if (!bar_setup(&swaybar, socket_path)) { if (!bar_setup(&swaybar, socket_path)) {
free(socket_path); free(socket_path);
return 1; return 1;
@ -102,6 +94,10 @@ int main(int argc, char **argv) {
free(socket_path); free(socket_path);
signal(SIGINT, sig_handler);
signal(SIGTERM, sig_handler);
swaybar.running = true;
bar_run(&swaybar); bar_run(&swaybar);
bar_teardown(&swaybar); bar_teardown(&swaybar);
return 0; return 0;