nixo
/
gri3-wm
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Bugfix: Don't segfault, if child was killed

This commit is contained in:
Axel Wagner 2011-03-14 09:17:06 +01:00
parent c8032d552d
commit dfd566511e
1 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
i3bar/src/child.c
View File

@ -11,6 +11,7 @@
#include <stdlib.h> #include <stdlib.h>
#include <unistd.h> #include <unistd.h>
#include <sys/types.h> #include <sys/types.h>
#include <sys/wait.h>
#include <signal.h> #include <signal.h>
#include <stdio.h> #include <stdio.h>
#include <fcntl.h> #include <fcntl.h>
@ -35,11 +36,13 @@ char *statusline_buffer = NULL;
* *
*/ */
void cleanup() { void cleanup() {
if (stdin_io != NULL) {
ev_io_stop(main_loop, stdin_io); ev_io_stop(main_loop, stdin_io);
ev_child_stop(main_loop, child_sig); ev_child_stop(main_loop, child_sig);
FREE(stdin_io); FREE(stdin_io);
FREE(child_sig); FREE(child_sig);
FREE(statusline_buffer); FREE(statusline_buffer);
}
} }
/* /*
@ -174,8 +177,11 @@ void kill_child() {
if (child_pid != 0) { if (child_pid != 0) {
kill(child_pid, SIGCONT); kill(child_pid, SIGCONT);
kill(child_pid, SIGTERM); kill(child_pid, SIGTERM);
} int status;
waitpid(child_pid, &status, 0);
child_pid = 0;
cleanup(); cleanup();
}
} }
/* /*