From: markt <markt@13f79535-47bb-0310-9956-ffa450edef68>
Date: Thu, 10 Jul 2008 21:11:16 +0000 (+0000)
Subject: Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=42722
X-Git-Url: https://git.internetallee.de/?a=commitdiff_plain;h=b8e4af5b9cd97022cec8ede8c00d15caf955f220;p=tomcat7.0

Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=42722
Possible NPE in CGIServlet.java
Patch provided by Nils Hammar

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

diff --git a/java/org/apache/catalina/servlets/CGIServlet.java b/java/org/apache/catalina/servlets/CGIServlet.java
index a69cf4eb7..1de39acd1 100644
--- a/java/org/apache/catalina/servlets/CGIServlet.java
+++ b/java/org/apache/catalina/servlets/CGIServlet.java
@@ -1728,8 +1728,10 @@ public final class CGIServlet extends HttpServlet {
                     }
                 } //replacement for Process.waitFor()
     
-                // Close the output stream used
-                cgiOutput.close();
+                // Close the output stream if used
+                if (cgiOutput != null) {
+                    cgiOutput.close();
+                }
             }
             catch (IOException e){
                 log ("Caught exception " + e);