Merge in 'release/7.0' changes

dotnet · Jan 17, 2023 · 153136d · 153136d
2 parents de2e228 + 7db1c33
commit 153136d
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 28 deletions.
diff --git a/src/coreclr/pal/src/exception/signal.cpp b/src/coreclr/pal/src/exception/signal.cpp
@@ -294,22 +294,6 @@ void SEHCleanupSignals()
     }
 }
 
-/*++
-Function :
-    SEHCleanupAbort()
-
-    Restore default SIGABORT signal handlers
-
-    (no parameters, no return value)
---*/
-void SEHCleanupAbort()
-{
-    if (g_registered_signal_handlers)
-    {
-        restore_signal(SIGABRT, &g_previous_sigabrt);
-    }
-}
-
 /* internal function definitions **********************************************/
 
 /*++

diff --git a/src/coreclr/pal/src/include/pal/signal.hpp b/src/coreclr/pal/src/include/pal/signal.hpp
@@ -117,14 +117,4 @@ Function :
 --*/
 void SEHCleanupSignals();
 
-/*++
-Function :
-    SEHCleanupAbort()
-
-    Restore default SIGABORT signal handlers
-
-    (no parameters, no return value)
---*/
-void SEHCleanupAbort();
-
 #endif /* _PAL_SIGNAL_HPP_ */
diff --git a/src/coreclr/pal/src/thread/process.cpp b/src/coreclr/pal/src/thread/process.cpp
@@ -2677,8 +2677,9 @@ PROCAbort(int signal)
 
     PROCCreateCrashDumpIfEnabled(signal);
 
-    // Restore the SIGABORT handler to prevent recursion
-    SEHCleanupAbort();
+    // Restore all signals; the SIGABORT handler to prevent recursion and
+    // the others to prevent multiple core dumps from being generated.
+    SEHCleanupSignals();
 
     // Abort the process after waiting for the core dump to complete
     abort();