jh163888/xrdp
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

gracefully handle segfaults in chansrv code

Browse Source
This commit is contained in:
Laxmikant Rashinkar 2013-09-03 19:44:20 -07:00
parent 829c494fb9
commit ece8f1fb47
2 changed files with 22 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
common/os_calls.c
View File

@ -2500,6 +2500,17 @@ g_signal_child_stop(void (*func)(int))
#endif
}
/*****************************************************************************/
void APP_CC
g_signal_segfault(void (*func)(int))
{
#if defined(_WIN32)
#else
signal(SIGSEGV, func);
#endif
}
/*****************************************************************************/
/* does not work in win32 */
void APP_CC

12
sesman/chansrv/chansrv.c
View File

@ -1044,7 +1044,7 @@ child_signal_handler(int sig)
{
int i1;
LOG(10, ("child_signal_handler:"));
LOG(0, ("child_signal_handler:"));
do
{
@ -1061,6 +1061,14 @@ child_signal_handler(int sig)
while (i1 >= 0);
}
void DEFAULT_CC
segfault_signal_handler(int sig)
{
LOG(0, ("segfault_signal_handler: entered......."));
xfuse_deinit();
exit(0);
}
/*****************************************************************************/
static int APP_CC
get_display_num_from_display(char *display_text)
@ -1272,6 +1280,8 @@ main(int argc, char **argv)
g_signal_user_interrupt(term_signal_handler); /* SIGINT */
g_signal_pipe(nil_signal_handler); /* SIGPIPE */
g_signal_child_stop(child_signal_handler); /* SIGCHLD */
g_signal_segfault(segfault_signal_handler);
display_text = g_getenv("DISPLAY");
LOGM((LOG_LEVEL_INFO, "main: DISPLAY env var set to %s", display_text));
get_display_num_from_display(display_text);