TODO

Author: ex0dus-0x

src/include/deepstate/DeepState.h

@@ -735,20 +735,19 @@ static int DeepState_RunTestNoFork(struct DeepState_TestInfo *test) {
 /* Fork and run `test`. */
 static enum DeepState_TestRunResult
 DeepState_ForkAndRunTest(struct DeepState_TestInfo *test) {
+  pid_t test_pid;
+  if (FLAGS_fork) {
 
-  /* If flag is set, install a signal handler for SIGCHLD */
-  /* TODO(alan): use handler as robust "multiplexer" and handle child signal */
-  if (FLAGS_verbose_crash_trace) {
-    struct sigaction sigact, oldact;
+    /* If flag is set, install a signal handler for SIGCHLD */
+    if (FLAGS_verbose_crash_trace) {
+      struct sigaction sigact, oldact;
 
-    sigact.sa_flags = SA_SIGINFO | SA_NOCLDWAIT;
-    sigact.sa_sigaction = DeepState_EmitBacktrace;
+      sigact.sa_flags = SA_SIGINFO | SA_NOCLDWAIT;
+      sigact.sa_sigaction = DeepState_EmitBacktrace;
 
-    sigaction(SIGCHLD, &sigact, &oldact);
-  }
+      sigaction(SIGCHLD, &sigact, &oldact);
+    }
 
-  pid_t test_pid;
-  if (FLAGS_fork) {
     test_pid = fork();
     if (!test_pid) {
       DeepState_RunTest(test);
@@ -759,6 +758,19 @@ DeepState_ForkAndRunTest(struct DeepState_TestInfo *test) {
   if (FLAGS_fork) {
     waitpid(test_pid, &wstatus, 0);
   } else {
+
+    /* If flag is set, install a signal handler for any arbitrary crash*/
+    if (FLAGS_verbose_crash_trace) {
+
+      struct sigaction sigact, oldact;
+
+      sigact.sa_flags = SA_SIGINFO | SA_NODEFER;
+      sigact.sa_sigaction = DeepState_EmitBacktrace;
+
+      sigaction(SIGBUS, &sigact, &oldact);
+      sigaction(SIGSEGV, &sigact, &oldact);
+    }
+
     wstatus = DeepState_RunTestNoFork(test);
     DeepState_CleanUp();
   }