From: Christophe Jaillet <jailletc36@apache.org>
Date: Sat, 15 Feb 2020 14:22:22 +0000 (+0000)
Subject: Avoid UBSan exception  calling memcpy(,NULL,0) at startup.
X-Git-Tag: 2.5.0-alpha2-ci-test-only~1654
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b1a82c2ce37a3167241e23c7dc5c6023a07ab9a0;p=thirdparty%2Fapache%2Fhttpd.git

Avoid UBSan exception  calling memcpy(,NULL,0) at startup.

Follow-up to r1874011 which did the same for the event MPM.

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

diff --git a/server/mpm/worker/worker.c b/server/mpm/worker/worker.c
index 60ec82b93ad..7c7a75cf0b8 100644
--- a/server/mpm/worker/worker.c
+++ b/server/mpm/worker/worker.c
@@ -1967,8 +1967,9 @@ static int worker_open_logs(apr_pool_t *p, apr_pool_t *plog, apr_pool_t *ptemp,
             new_max = num_buckets;
         }
         new_ptr = (int *)apr_palloc(ap_pglobal, new_max * sizeof(int));
-        memcpy(new_ptr, retained->idle_spawn_rate,
-               retained->mpm->num_buckets * sizeof(int));
+        if (retained->idle_spawn_rate) /* NULL at startup */
+            memcpy(new_ptr, retained->idle_spawn_rate,
+                   etained->mpm->num_buckets * sizeof(int));
         retained->idle_spawn_rate = new_ptr;
         retained->mpm->max_buckets = new_max;
     }