You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by ma...@apache.org on 2014/09/01 12:15:01 UTC
svn commit: r1621729 - in /tomcat/trunk:
java/org/apache/catalina/servlets/DefaultServlet.java
webapps/docs/changelog.xml
Author: markt
Date: Mon Sep 1 10:15:01 2014
New Revision: 1621729
URL: http://svn.apache.org/r1621729
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=56902
Potential resource leak in Default Servlet
Based on a patch by Felix Schumacher
Modified:
tomcat/trunk/java/org/apache/catalina/servlets/DefaultServlet.java
tomcat/trunk/webapps/docs/changelog.xml
Modified: tomcat/trunk/java/org/apache/catalina/servlets/DefaultServlet.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/servlets/DefaultServlet.java?rev=1621729&r1=1621728&r2=1621729&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/servlets/DefaultServlet.java (original)
+++ tomcat/trunk/java/org/apache/catalina/servlets/DefaultServlet.java Mon Sep 1 10:15:01 2014
@@ -2032,27 +2032,24 @@ public class DefaultServlet extends Http
while ( (exception == null) && (ranges.hasNext()) ) {
InputStream resourceInputStream = resource.getInputStream();
- InputStream istream =
- new BufferedInputStream(resourceInputStream, input);
+ try (InputStream istream = new BufferedInputStream(resourceInputStream, input)) {
- Range currentRange = ranges.next();
-
- // Writing MIME header.
- ostream.println();
- ostream.println("--" + mimeSeparation);
- if (contentType != null)
- ostream.println("Content-Type: " + contentType);
- ostream.println("Content-Range: bytes " + currentRange.start
- + "-" + currentRange.end + "/"
- + currentRange.length);
- ostream.println();
-
- // Printing content
- exception = copyRange(istream, ostream, currentRange.start,
- currentRange.end);
-
- istream.close();
+ Range currentRange = ranges.next();
+ // Writing MIME header.
+ ostream.println();
+ ostream.println("--" + mimeSeparation);
+ if (contentType != null)
+ ostream.println("Content-Type: " + contentType);
+ ostream.println("Content-Range: bytes " + currentRange.start
+ + "-" + currentRange.end + "/"
+ + currentRange.length);
+ ostream.println();
+
+ // Printing content
+ exception = copyRange(istream, ostream, currentRange.start,
+ currentRange.end);
+ }
}
ostream.println();
Modified: tomcat/trunk/webapps/docs/changelog.xml
URL: http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=1621729&r1=1621728&r2=1621729&view=diff
==============================================================================
--- tomcat/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/trunk/webapps/docs/changelog.xml Mon Sep 1 10:15:01 2014
@@ -52,6 +52,11 @@
property files reported by Coverity Scan. Based on patches provided by
Felix Schumacher. (markt)
</fix>
+ <fix>
+ <bug>56902</bug>: Fix a potential resource leak in the Default Servlet
+ reported by Coverity Scan. Based on a patch provided by Felix
+ Schumacher. (markt)
+ </fix>
</changelog>
</subsection>
</section>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org