svn commit: r1476143 - in /httpd/httpd/branches/2.4.x: ./ CHANGES STATUS modules/metadata/mod_setenvif.c

[rp...@apache.org]

Author: rpluem
Date: Fri Apr 26 11:31:59 2013
New Revision: 1476143

URL: http://svn.apache.org/r1476143
Log:
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

Modified:
    httpd/httpd/branches/2.4.x/   (props changed)
    httpd/httpd/branches/2.4.x/CHANGES
    httpd/httpd/branches/2.4.x/STATUS
    httpd/httpd/branches/2.4.x/modules/metadata/mod_setenvif.c

Propchange: httpd/httpd/branches/2.4.x/
------------------------------------------------------------------------------
  Merged /httpd/httpd/trunk:r1471449

Modified: httpd/httpd/branches/2.4.x/CHANGES
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/CHANGES?rev=1476143&r1=1476142&r2=1476143&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/CHANGES [utf-8] (original)
+++ httpd/httpd/branches/2.4.x/CHANGES [utf-8] Fri Apr 26 11:31:59 2013
@@ -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]
 

Modified: httpd/httpd/branches/2.4.x/STATUS
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/STATUS?rev=1476143&r1=1476142&r2=1476143&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/STATUS (original)
+++ httpd/httpd/branches/2.4.x/STATUS Fri Apr 26 11:31:59 2013
@@ -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 ]

Modified: httpd/httpd/branches/2.4.x/modules/metadata/mod_setenvif.c
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/modules/metadata/mod_setenvif.c?rev=1476143&r1=1476142&r2=1476143&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/modules/metadata/mod_setenvif.c (original)
+++ httpd/httpd/branches/2.4.x/modules/metadata/mod_setenvif.c Fri Apr 26 11:31:59 2013
@@ -314,7 +314,7 @@ static const char *add_setenvif_core(cmd
      */
     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;
         }