From: André Malo <nd@apache.org>
Date: Sun, 18 Apr 2004 19:17:43 +0000 (+0000)
Subject: don't segfault, when setting an empty header value
X-Git-Tag: pre_ajp_proxy~352
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=46e408aa32d5015d35fed4bfdcc64cf89f167567;p=apache

don't segfault, when setting an empty header value


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

diff --git a/CHANGES b/CHANGES
index 309892a265..085dc5a83c 100644
--- a/CHANGES
+++ b/CHANGES
@@ -2,6 +2,9 @@ Changes with Apache 2.1.0-dev
 
   [Remove entries to the current 2.0 section below, when backported]
 
+  *) mod_headers no longer crashes if an empty header value should
+     be added.  [André Malo]
+
   *) mod_cgi: Handle output on stderr during script execution on Unix
      platforms; preventing deadlock when stderr output fills pipe buffer.
      PR 22030.  [Joe Orton, Jeff Trawick]
diff --git a/modules/metadata/mod_headers.c b/modules/metadata/mod_headers.c
index d20f57bcbd..ec2fa2873f 100644
--- a/modules/metadata/mod_headers.c
+++ b/modules/metadata/mod_headers.c
@@ -474,7 +474,7 @@ static char* process_tags(header_entry *hdr, request_rec *r)
         else
             str = apr_pstrcat(r->pool, str, s, NULL);
     }
-    return str;
+    return str ? str : "";
 }
 
 static int echo_header(echo_do *v, const char *key, const char *val)