]> git.ipfire.org Git - thirdparty/apache/httpd.git/commitdiff
* server/mpm/event/event.c (event_open_logs): Avoid UBSan exception
authorJoe Orton <jorton@apache.org>
Fri, 14 Feb 2020 10:47:36 +0000 (10:47 +0000)
committerJoe Orton <jorton@apache.org>
Fri, 14 Feb 2020 10:47:36 +0000 (10:47 +0000)
  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

server/mpm/event/event.c

index 3fddcd539d58c03f5175bb1ec08b48b6b1ebeef1..a3647cf8caca0d083db77df504fed27c30961f25 100644 (file)
@@ -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;
     }