store SIGSEGV signal handler to return it in the next call

ssbssa · Feb 25, 2024 · 0c6e8b4 · 0c6e8b4
1 parent b33ad28
commit 0c6e8b4
Showing 1 changed file with 8 additions and 1 deletion.
diff --git a/heob-inj.c b/heob-inj.c
@@ -138,6 +138,9 @@ typedef struct localData
   HMODULE msvcrt;
   HMODULE ucrtbase;
 
+  // SIGSEGV handler set by signal(), returned by the next call
+  void *crtSigSegvHandler;
+
   splitAllocation *splits;
   int ptrShift;
   allocType newArrAllocMethod;
@@ -1267,7 +1270,11 @@ static void *new_signal( int sig,void (*func)(int) )
   GET_REMOTEDATA( rd );
 
   if( rd->opt.handleException && sig==11 ) // SIGSEGV
-    return( (void*)0 ); // SIG_DFL
+  {
+    void *prevSigSegvHandler = rd->crtSigSegvHandler;
+    rd->crtSigSegvHandler = func;
+    return( prevSigSegvHandler );
+  }
 
   return( rd->fsignal(sig,func) );
 }