From: Joe Orton <jorton@apache.org>
Date: Mon, 20 Jan 2025 10:24:13 +0000 (+0000)
Subject: Merge r1921067 from trunk:
X-Git-Tag: 2.4.63-candidate~7
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=000cd2291d3d2c40682ec607e8d3b0711ac5a097;p=thirdparty%2Fapache%2Fhttpd.git

Merge r1921067 from trunk:

* Take care for the case where nkey is NULL

PR: 69358
Reported by: <zhora.budyukin111 gmail.com>
Submitted by: rpluem
Reviewed by: jailletc36, rjung, jorton


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1923247 13f79535-47bb-0310-9956-ffa450edef68
---

diff --git a/CHANGES b/CHANGES
index 14cd5f2f14a..6f572d2976b 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,6 +1,9 @@
                                                          -*- coding: utf-8 -*-
 Changes with Apache 2.4.63
 
+  *) mod_cache_socache: Fix possible crash on error path. PR 69358.
+     [Ruediger Pluem]
+
   *) mod_md: update to version 2.4.31
      - Improved error reporting when waiting for ACME server to verify domains
        or finalizing the order fails, e.g. times out.
diff --git a/modules/cache/mod_cache_socache.c b/modules/cache/mod_cache_socache.c
index 5f9e1d6c661..38f1bfb2793 100644
--- a/modules/cache/mod_cache_socache.c
+++ b/modules/cache/mod_cache_socache.c
@@ -700,9 +700,11 @@ fail:
             return DECLINED;
         }
     }
-    conf->provider->socache_provider->remove(
-            conf->provider->socache_instance, r->server,
-            (unsigned char *) nkey, strlen(nkey), r->pool);
+    if (nkey) {
+        conf->provider->socache_provider->remove(
+                conf->provider->socache_instance, r->server,
+                (unsigned char *) nkey, strlen(nkey), r->pool);
+    }
     if (socache_mutex) {
         apr_status_t status = apr_global_mutex_unlock(socache_mutex);
         if (status != APR_SUCCESS) {