STABLE14-windows-process-detach-20051227

The procmgmt library replaces the C RunTime Library's signal handlers
but does not restore them on process detachment.  This leaves the
process with signal handlers pointing to invalid code that generates
an invalid access error during process termination if the library
was previously unloaded.

(cherry picked from commit 3875eec844609443710d3b98a2ac795d7f2d9121)

diff --git a/src/procmgmt/pmgtprivate.h b/src/procmgmt/pmgtprivate.h
index bbbabe63ae21649748ae037d8542ec40bf8e8ead..04b0dd23663840d3cd6de8f5b9ba1e0da3bbc26a 100644 (file)
--- a/src/procmgmt/pmgtprivate.h
+++ b/src/procmgmt/pmgtprivate.h
@@ -30,6 +30,7 @@
 
 extern int pmgt_SignalRaiseLocalByName(const char *signo, int *libSigno);
 extern int pmgt_RedirectNativeSignals(void);
+extern int pmgt_RestoreNativeSignals(void);
 
 #else
 /* Private process management definitions and declarations for Unix */

diff --git a/src/procmgmt/procmgmt_nt.c b/src/procmgmt/procmgmt_nt.c
index f62134ae426fab91e2e0e50050eae4e84e03c752..2fa0e81a01aeb783af470ad84d7e6bd0a271a3ad 100644 (file)
--- a/src/procmgmt/procmgmt_nt.c
+++ b/src/procmgmt/procmgmt_nt.c
@@ -1363,7 +1363,8 @@ DllMain(HINSTANCE dllInstHandle,  /* instance handle for this DLL module */
        DWORD reason,           /* reason function is being called */
        LPVOID reserved)
 {                              /* reserved for future use */
-    if (reason == DLL_PROCESS_ATTACH) {
+    switch (reason) {
+    case DLL_PROCESS_ATTACH:
        /* library is being attached to a process */
        if (PmgtLibraryInitialize()) {
            /* failed to initialize library */
@@ -1372,7 +1373,11 @@ DllMain(HINSTANCE dllInstHandle, /* instance handle for this DLL module */
 
        /* disable thread attach/detach notifications */
        (void)DisableThreadLibraryCalls(dllInstHandle);
+       return TRUE;
+    case DLL_PROCESS_DETACH:
+       pmgt_RestoreNativeSignals();
+       return TRUE;
+    default:
+       return FALSE;
     }
-
-    return TRUE;
 }

diff --git a/src/procmgmt/redirect_nt.c b/src/procmgmt/redirect_nt.c
index 2eabcc1621e2156d0191cb5ba38e87f93d193a1e..c27551e3e27713b1d3c058d1002ebde24890f148 100644 (file)
--- a/src/procmgmt/redirect_nt.c
+++ b/src/procmgmt/redirect_nt.c
@@ -110,3 +110,23 @@ pmgt_RedirectNativeSignals(void)
        return 0;
     }
 }
+
+/*
+ * pmgt_RedirectNativeSignals() -- initialize native signal redirection.
+ */
+int
+pmgt_RestoreNativeSignals(void)
+{
+    if (signal(SIGINT, SIG_DFL) == SIG_ERR
+       || signal(SIGILL, SIG_DFL) == SIG_ERR
+       || signal(SIGFPE, SIG_DFL) == SIG_ERR
+       || signal(SIGSEGV, SIG_DFL) == SIG_ERR
+       || signal(SIGTERM, SIG_DFL) == SIG_ERR
+       || signal(SIGABRT, SIG_DFL) == SIG_ERR) {
+       errno = EINVAL;
+       return -1;
+    } else {
+       return 0;
+    }
+}
+