mirrors/sway
1
0
Fork 0
mirror of https://github.com/swaywm/sway.git synced 2025-10-29 05:40:18 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

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
parent 96de2b539c
commit 5484f308b9
3 changed files with 10 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

14
swaybar/main.c
View file

@ -11,13 +11,7 @@
static struct swaybar swaybar;
void sig_handler(int signal) {
bar_teardown(&swaybar);
exit(0);
}
void sway_terminate(int code) {
bar_teardown(&swaybar);
exit(code);
swaybar.running = false;
}
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)) {
free(socket_path);
return 1;
@ -102,6 +94,10 @@ int main(int argc, char **argv) {
free(socket_path);
signal(SIGINT, sig_handler);
signal(SIGTERM, sig_handler);
swaybar.running = true;
bar_run(&swaybar);
bar_teardown(&swaybar);
return 0;