From 70589f493bfc669504280ea624cc1c891b52b427 Mon Sep 17 00:00:00 2001
From: markt <markt@13f79535-47bb-0310-9956-ffa450edef68>
Date: Sun, 1 Nov 2009 22:53:29 +0000
Subject: [PATCH] Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=47451
 Don't trigger an NPE if headers with null or zero length name or set or if a
 null value is specified. Silently ignore any such calls in the same way the
 calls are ignored if the response has already been committed.

git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@831774 13f79535-47bb-0310-9956-ffa450edef68
---
 java/org/apache/catalina/connector/Response.java | 24 ++++++++++++++++++++++++
 1 file changed, 24 insertions(+)

diff --git a/java/org/apache/catalina/connector/Response.java b/java/org/apache/catalina/connector/Response.java
index 9db6febf5..dbfbeaa1e 100644
--- a/java/org/apache/catalina/connector/Response.java
+++ b/java/org/apache/catalina/connector/Response.java
@@ -1009,6 +1009,10 @@ public class Response
      */
     public void addDateHeader(String name, long value) {
 
+        if (name == null || name.length() == 0) {
+            return;
+        }
+
         if (isCommitted())
             return;
 
@@ -1036,6 +1040,10 @@ public class Response
      */
     public void addHeader(String name, String value) {
 
+        if (name == null || name.length() == 0 || value == null) {
+            return;
+        }
+
         if (isCommitted())
             return;
 
@@ -1056,6 +1064,10 @@ public class Response
      */
     public void addIntHeader(String name, int value) {
 
+        if (name == null || name.length() == 0) {
+            return;
+        }
+
         if (isCommitted())
             return;
 
@@ -1281,6 +1293,10 @@ public class Response
      */
     public void setDateHeader(String name, long value) {
 
+        if (name == null || name.length() == 0) {
+            return;
+        }
+
         if (isCommitted())
             return;
 
@@ -1308,6 +1324,10 @@ public class Response
      */
     public void setHeader(String name, String value) {
 
+        if (name == null || name.length() == 0 || value == null) {
+            return;
+        }
+
         if (isCommitted())
             return;
 
@@ -1328,6 +1348,10 @@ public class Response
      */
     public void setIntHeader(String name, int value) {
 
+        if (name == null || name.length() == 0) {
+            return;
+        }
+
         if (isCommitted())
             return;
 
-- 
2.11.0