httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From wr...@apache.org
Subject svn commit: r584975 - in /httpd/httpd/branches/2.2.x: STATUS server/mpm/winnt/child.c
Date Mon, 15 Oct 2007 23:49:33 GMT
Author: wrowe
Date: Mon Oct 15 16:49:32 2007
New Revision: 584975

URL: http://svn.apache.org/viewvc?rev=584975&view=rev
Log:
mpm_winnt: Fix null pointer dereference
PR 42572

Backports: 563489


Modified:
    httpd/httpd/branches/2.2.x/STATUS
    httpd/httpd/branches/2.2.x/server/mpm/winnt/child.c

Modified: httpd/httpd/branches/2.2.x/STATUS
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/STATUS?rev=584975&r1=584974&r2=584975&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/STATUS (original)
+++ httpd/httpd/branches/2.2.x/STATUS Mon Oct 15 16:49:32 2007
@@ -182,11 +182,6 @@
      niq says: Yes, when we add r584842 to the proposal.
      rpluem says: Yes.
      
-   * mpm_winnt: Fix null pointer dereference
-     PR 42572
-     http://svn.apache.org/viewvc/httpd/httpd/trunk/server/mpm/winnt/child.c?r1=505027&r2=563489
-     +1: niq (this is clear enough to vote 'blind'), rpluem
-
    * mod_proxy_http: Don't mangle proxied URLs
      PR 42592
      http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/proxy/mod_proxy_http.c?r1=582655&r2=583803&pathrev=583803

Modified: httpd/httpd/branches/2.2.x/server/mpm/winnt/child.c
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/server/mpm/winnt/child.c?rev=584975&r1=584974&r2=584975&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/server/mpm/winnt/child.c (original)
+++ httpd/httpd/branches/2.2.x/server/mpm/winnt/child.c Mon Oct 15 16:49:32 2007
@@ -1187,7 +1187,10 @@
         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));
-        ap_update_child_status_from_indexes(0, *score_idx, SERVER_DEAD, NULL);
+        if (score_idx) {
+            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);



Mime
View raw message