From: Yann Ylavic <ylavic@apache.org>
Date: Fri, 11 May 2018 09:31:13 +0000 (+0000)
Subject: mod_slotmem_shm: follow up to r1830800, preserve callee API.
X-Git-Tag: 2.5.0-alpha2-ci-test-only~2613
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=eb353ffa5de91e37877141a42e51e33178e32a34;p=thirdparty%2Fapache%2Fhttpd.git

mod_slotmem_shm: follow up to r1830800, preserve callee API.

The caller might (and actually balancer_child_init() does) rely on
slotmem_attach() to not mangle the passed in/out slotmem pointer on
failure.

[Reverted by r1831868]


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

diff --git a/modules/slotmem/mod_slotmem_shm.c b/modules/slotmem/mod_slotmem_shm.c
index 92095d11728..8d6bc48fe83 100644
--- a/modules/slotmem/mod_slotmem_shm.c
+++ b/modules/slotmem/mod_slotmem_shm.c
@@ -586,7 +586,6 @@ static apr_status_t slotmem_attach(ap_slotmem_instance_t **new,
     apr_shm_t *shm;
     apr_status_t rv;
 
-    *new = NULL;
     ap_mpm_query(AP_MPMQ_GENERATION, &generation);
 
     if (!slotmem_filenames(pool, name, &fname, NULL)) {