From: Jan Kaluža <jkaluza@apache.org>
Date: Tue, 26 Aug 2014 11:05:37 +0000 (+0000)
Subject: worker MPM: Fix null-dereference crash when using -DFOREGROUND with worker MPM
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=be0e74ac86fc91501cd9b4565bcc2426d2ed57b1;p=thirdparty%2Fapache%2Fhttpd.git

worker MPM: Fix null-dereference crash when using -DFOREGROUND with worker MPM


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

diff --git a/server/mpm/worker/worker.c b/server/mpm/worker/worker.c
index 486ce60b84b..35d5e04def0 100644
--- a/server/mpm/worker/worker.c
+++ b/server/mpm/worker/worker.c
@@ -2097,10 +2097,10 @@ static int worker_pre_config(apr_pool_t *pconf, apr_pool_t *plog,
                              "apr_proc_detach failed");
                 return HTTP_INTERNAL_SERVER_ERROR;
             }
-            retained->idle_spawn_rate = apr_palloc(pconf, sizeof(int) * num_buckets);
-            for (i = 0; i< num_buckets; i++) {
-                retained->idle_spawn_rate[i] = 1;
-            }
+        }
+        retained->idle_spawn_rate = apr_palloc(pconf, sizeof(int) * num_buckets);
+        for (i = 0; i< num_buckets; i++) {
+            retained->idle_spawn_rate[i] = 1;
         }
     }