Merge r1471449 from trunk:

* Fix null pointer dereference in case SetEnvif and SetEnvIfExpr are used
  together.

PR: 54881

Submitted by: rpluem
Reviewed by: rpluem, covener, humbedooh

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

diff --git a/CHANGES b/CHANGES
index 7aa1f49a6d564683f545b21a9f15bcea9996fa06..2aa3c5d168909df772d7e2505a40d1ec811b6cd6 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -2,6 +2,9 @@
  
 Changes with Apache 2.4.5
 
+  *) mod_setenvif: Fix crash in case SetEnvif and SetEnvIfExpr are used
+     together. PR 54881. [Ruediger Pluem]
+
   *) htdigest: Fix buffer overflow when reading digest password file
      with very long lines. PR 54893. [Rainer Jung]
 

diff --git a/STATUS b/STATUS
index 0ce81d62f83156bcb39630c1db89b897aa602d58..ee36b9dace9bb8239b9a34191884a83646263ff9 100644 (file)
--- a/STATUS
+++ b/STATUS
@@ -99,14 +99,6 @@ PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
       trunk patches: https://svn.apache.org/r1470183
       2.4.x patch: trunk patches work
       +1: sf, covener, rpluem
-      
-    * mod_setenvif: Fix null pointer dereference in case SetEnvif and
-      SetEnvIfExpr are used together.  PR: 54881
-      Trunk version of patch:
-         http://svn.apache.org/r1471449
-      Backport version for 2.4.x of patch:
-         Trunk version of patch works
-      +1: rpluem, covener, humbedooh
 
 PATCHES PROPOSED TO BACKPORT FROM TRUNK:
   [ New proposals should be added at the end of the list ]

diff --git a/modules/metadata/mod_setenvif.c b/modules/metadata/mod_setenvif.c
index 65214cd4f015057ff10f0bc7eeaba4439dd6e9e2..a62670e0bdcb45a025c01df54893a33911290937 100644 (file)
--- a/modules/metadata/mod_setenvif.c
+++ b/modules/metadata/mod_setenvif.c
@@ -314,7 +314,7 @@ static const char *add_setenvif_core(cmd_parms *cmd, void *mconfig,
      */
     for (i = 0; i < sconf->conditionals->nelts; ++i) {
         new = &entries[i];
-        if (!strcasecmp(new->name, fname)) {
+        if (new->name && !strcasecmp(new->name, fname)) {
             fname = new->name;
             break;
         }