From 5f4c783e032a106764f1ea407396ddb10ae47251 Mon Sep 17 00:00:00 2001 From: Ruediger Pluem Date: Wed, 24 Apr 2013 14:58:10 +0000 Subject: [PATCH] * Fix null pointer dereference in case SetEnvif and SetEnvIfExpr are used together. PR: 54881 git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1471449 13f79535-47bb-0310-9956-ffa450edef68 --- CHANGES | 3 +++ modules/metadata/mod_setenvif.c | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/CHANGES b/CHANGES index 05376b54f7..deca4432f0 100644 --- a/CHANGES +++ b/CHANGES @@ -1,6 +1,9 @@ -*- coding: utf-8 -*- Changes with Apache 2.5.0 + *) mod_setenvif: Fix crash in case SetEnvif and SetEnvIfExpr are used + together. PR 54881. [Ruediger Pluem] + *) mod_dav: Make sure that when we prepare an If URL for Etag comparison, we compare unencoded paths. PR 53910 [Timothy Wood ] diff --git a/modules/metadata/mod_setenvif.c b/modules/metadata/mod_setenvif.c index 65214cd4f0..a62670e0bd 100644 --- 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; } -- 2.40.0