From: Joe Orton <jorton@apache.org>
Date: Fri, 14 Feb 2020 10:47:36 +0000 (+0000)
Subject: * server/mpm/event/event.c (event_open_logs): Avoid UBSan exception
X-Git-Tag: 2.5.0-alpha2-ci-test-only~1655
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e5532641682a910888e43896198d2eba9781989a;p=thirdparty%2Fapache%2Fhttpd.git

* server/mpm/event/event.c (event_open_logs): Avoid UBSan exception
  calling memcpy(,NULL,0) at startup.  Thanks to rpluem.


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

diff --git a/server/mpm/event/event.c b/server/mpm/event/event.c
index 3fddcd539d5..a3647cf8cac 100644
--- a/server/mpm/event/event.c
+++ b/server/mpm/event/event.c
@@ -3616,8 +3616,9 @@ static int event_open_logs(apr_pool_t * p, apr_pool_t * plog,
             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,
+                   retained->mpm->num_buckets * sizeof(int));
         retained->idle_spawn_rate = new_ptr;
         retained->mpm->max_buckets = new_max;
     }