Author: fschumacher
Date: Sat Jan 24 14:42:27 2015
New Revision: 1654524
URL: http://svn.apache.org/r1654524
Log:
Close input and output streams in expandCGIScript to
avoid resource leaks. Issue reported by Coverity Scan.
Modified:
tomcat/trunk/java/org/apache/catalina/servlets/CGIServlet.java
Modified: tomcat/trunk/java/org/apache/catalina/servlets/CGIServlet.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/servlets/CGIServlet.java?rev=1654524&r1=1654523&r2=1654524&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/servlets/CGIServlet.java (original)
+++ tomcat/trunk/java/org/apache/catalina/servlets/CGIServlet.java Sat Jan 24
14:42:27 2015
@@ -1133,6 +1133,10 @@ public final class CGIServlet extends Ht
File f = new File(destPath.toString());
if (f.exists()) {
+ try {
+ is.close();
+ } catch (IOException ignore) {
+ }
// Don't need to expand if it already exists
return;
}
@@ -1162,10 +1166,16 @@ public final class CGIServlet extends Ht
}
FileOutputStream fos = new FileOutputStream(f);
- // copy data
- IOTools.flow(is, fos);
- is.close();
- fos.close();
+ try {
+ // copy data
+ IOTools.flow(is, fos);
+ } finally {
+ try {
+ is.close();
+ } catch (IOException ignore) {
+ }
+ fos.close();
+ }
if (debug >= 2) {
log("expandCGIScript: expanded '" + srcPath + "' to '"
+ destPath + "'");
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
