PR 42572: crash in Windows MPM

Davi Arnauts simple patch confirmed as working.
(typo in my last commit)

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@563489 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/server/mpm/winnt/child.c b/server/mpm/winnt/child.c
index 86d12babc0be946ff9a20db6dca568e380c07479..8cae2d5efda8e73544f25c222aafe92c9964b2db 100644 (file)
--- a/server/mpm/winnt/child.c
+++ b/server/mpm/winnt/child.c
@@ -1184,10 +1184,10 @@ void child_main(apr_pool_t *pconf)
         TerminateThread(child_handles[i], 1);
         CloseHandle(child_handles[i]);
         /* Reset the scoreboard entry for the thread we just whacked */
+        score_idx = apr_hash_get(ht, &child_handles[i], sizeof(HANDLE));
         if (score_idx) {
-            score_idx = apr_hash_get(ht, &child_handles[i], sizeof(HANDLE));
+            ap_update_child_status_from_indexes(0, *score_idx, SERVER_DEAD, NULL);
         }
-        ap_update_child_status_from_indexes(0, *score_idx, SERVER_DEAD, NULL);
     }
     ap_log_error(APLOG_MARK, APLOG_NOTICE, APR_SUCCESS, ap_server_conf,
                  "Child %d: All worker threads have exited.", my_pid);