Attachment 943725 Details for Bug 1149211 – patch for resource leaks for properties loading found by coverity

[patch] patch for resource leaks for properties loading found by coverity

properStreamClosing.patch (text/plain), 6.94 KB, created by Radim Hatlapatka on 2014-10-03 14:16:00 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Radim Hatlapatka

Created: 2014-10-03 14:16:00 UTC

Size: 6.94 KB

patch

obsolete

>Index: src/main/java/org/apache/catalina/startup/ContextConfig.java
>===================================================================
>--- src/main/java/org/apache/catalina/startup/ContextConfig.java	(revision 2512)
>+++ src/main/java/org/apache/catalina/startup/ContextConfig.java	(working copy)
>@@ -19,21 +19,6 @@
> package org.apache.catalina.startup;
> 
> 
>-import java.io.File;
>-import java.io.IOException;
>-import java.io.InputStream;
>-import java.util.ArrayList;
>-import java.util.Collection;
>-import java.util.HashSet;
>-import java.util.Map;
>-import java.util.Properties;
>-import java.util.Set;
>-
>-import javax.servlet.HttpMethodConstraintElement;
>-import javax.servlet.ServletSecurityElement;
>-import javax.servlet.annotation.ServletSecurity.EmptyRoleSemantic;
>-import javax.servlet.annotation.ServletSecurity.TransportGuarantee;
>-
> import org.apache.catalina.Authenticator;
> import org.apache.catalina.Container;
> import org.apache.catalina.Context;
>@@ -54,8 +39,23 @@
> import org.apache.catalina.deploy.LoginConfig;
> import org.apache.catalina.deploy.SecurityCollection;
> import org.apache.catalina.deploy.SecurityConstraint;
>+import org.apache.tomcat.util.http.fileupload.IOUtils;
> import org.jboss.web.CatalinaLogger;
> 
>+import javax.servlet.HttpMethodConstraintElement;
>+import javax.servlet.ServletSecurityElement;
>+import javax.servlet.annotation.ServletSecurity.EmptyRoleSemantic;
>+import javax.servlet.annotation.ServletSecurity.TransportGuarantee;
>+import java.io.File;
>+import java.io.IOException;
>+import java.io.InputStream;
>+import java.util.ArrayList;
>+import java.util.Collection;
>+import java.util.HashSet;
>+import java.util.Map;
>+import java.util.Properties;
>+import java.util.Set;
>+
> /**
>  * Startup event listener for a <b>Context</b> that configures the properties
>  * of that Context, and the associated defined servlets.
>@@ -87,8 +87,9 @@
>     static {
>         // Load our mapping properties
>         authenticators = new Properties();
>+        InputStream is = null;
>         try {
>-            InputStream is = ContextConfig.class.getClassLoader().getResourceAsStream("org/apache/catalina/startup/Authenticators.properties");
>+            is = ContextConfig.class.getClassLoader().getResourceAsStream("org/apache/catalina/startup/Authenticators.properties");
>             if (is != null) {
>                 authenticators.load(is);
>             } else {
>@@ -96,6 +97,8 @@
>             }
>         } catch (IOException e) {
>             CatalinaLogger.STARTUP_LOGGER.failedLoadingAuthenticatoMappings(e);
>+        } finally {
>+            IOUtils.closeQuietly(is);
>         }
>     }
> 
>Index: src/main/java/org/apache/jasper/compiler/JDTCompiler.java
>===================================================================
>--- src/main/java/org/apache/jasper/compiler/JDTCompiler.java	(revision 2512)
>+++ src/main/java/org/apache/jasper/compiler/JDTCompiler.java	(working copy)
>@@ -17,6 +17,24 @@
> 
> package org.apache.jasper.compiler;
> 
>+import org.apache.jasper.JasperException;
>+import org.apache.tomcat.util.http.fileupload.IOUtils;
>+import org.eclipse.jdt.core.compiler.IProblem;
>+import org.eclipse.jdt.internal.compiler.ClassFile;
>+import org.eclipse.jdt.internal.compiler.CompilationResult;
>+import org.eclipse.jdt.internal.compiler.Compiler;
>+import org.eclipse.jdt.internal.compiler.DefaultErrorHandlingPolicies;
>+import org.eclipse.jdt.internal.compiler.ICompilerRequestor;
>+import org.eclipse.jdt.internal.compiler.IErrorHandlingPolicy;
>+import org.eclipse.jdt.internal.compiler.IProblemFactory;
>+import org.eclipse.jdt.internal.compiler.classfmt.ClassFileReader;
>+import org.eclipse.jdt.internal.compiler.env.ICompilationUnit;
>+import org.eclipse.jdt.internal.compiler.env.INameEnvironment;
>+import org.eclipse.jdt.internal.compiler.env.NameEnvironmentAnswer;
>+import org.eclipse.jdt.internal.compiler.impl.CompilerOptions;
>+import org.eclipse.jdt.internal.compiler.problem.DefaultProblemFactory;
>+import org.jboss.web.JasperLogger;
>+
> import java.io.BufferedOutputStream;
> import java.io.BufferedReader;
> import java.io.ByteArrayOutputStream;
>@@ -34,23 +52,6 @@
> import java.util.Map;
> import java.util.StringTokenizer;
> 
>-import org.apache.jasper.JasperException;
>-import org.eclipse.jdt.core.compiler.IProblem;
>-import org.eclipse.jdt.internal.compiler.ClassFile;
>-import org.eclipse.jdt.internal.compiler.CompilationResult;
>-import org.eclipse.jdt.internal.compiler.Compiler;
>-import org.eclipse.jdt.internal.compiler.DefaultErrorHandlingPolicies;
>-import org.eclipse.jdt.internal.compiler.ICompilerRequestor;
>-import org.eclipse.jdt.internal.compiler.IErrorHandlingPolicy;
>-import org.eclipse.jdt.internal.compiler.IProblemFactory;
>-import org.eclipse.jdt.internal.compiler.classfmt.ClassFileReader;
>-import org.eclipse.jdt.internal.compiler.env.ICompilationUnit;
>-import org.eclipse.jdt.internal.compiler.env.INameEnvironment;
>-import org.eclipse.jdt.internal.compiler.env.NameEnvironmentAnswer;
>-import org.eclipse.jdt.internal.compiler.impl.CompilerOptions;
>-import org.eclipse.jdt.internal.compiler.problem.DefaultProblemFactory;
>-import org.jboss.web.JasperLogger;
>-
> /**
>  * JDT class compiler. This compiler will load source dependencies from the
>  * context classloader, reducing dramatically disk access during 
>@@ -242,8 +243,12 @@
>                         return false;
>                     }
>                     String resourceName = result.replace('.', '/') + ".class";
>-                    InputStream is = 
>-                        classLoader.getResourceAsStream(resourceName);
>+                    InputStream is = null;
>+                    try {
>+                        is = classLoader.getResourceAsStream(resourceName);
>+                    } finally {
>+                        IOUtils.closeQuietly(is);
>+                    }
>                     return is == null;
>                 }
> 
>Index: src/main/java/org/apache/tomcat/util/http/HttpMessages.java
>===================================================================
>--- src/main/java/org/apache/tomcat/util/http/HttpMessages.java	(revision 2512)
>+++ src/main/java/org/apache/tomcat/util/http/HttpMessages.java	(working copy)
>@@ -17,11 +17,12 @@
> 
> package org.apache.tomcat.util.http;
> 
>+import org.apache.tomcat.util.http.fileupload.IOUtils;
>+import org.jboss.web.CoyoteLogger;
>+
> import java.io.InputStream;
> import java.util.Properties;
> 
>-import org.jboss.web.CoyoteLogger;
>-
> /**
>  * Handle (internationalized) HTTP messages.
>  * 
>@@ -36,11 +37,14 @@
>     protected static Properties statusMessages = new Properties();
>     
>     static {
>+        InputStream is = null;
>         try {
>-            InputStream is = HttpMessages.class.getClassLoader().getResourceAsStream("org/apache/tomcat/util/http/HttpMessages.properties");
>+            is = HttpMessages.class.getClassLoader().getResourceAsStream("org/apache/tomcat/util/http/HttpMessages.properties");
>             statusMessages.load(is);
>         } catch (Exception e) {
>             CoyoteLogger.HTTP_LOGGER.errorLoadingMessages(e);
>+        } finally {
>+            IOUtils.closeQuietly(is);
>         }
>     }
>

Actions: View | Diff

Attachments on bug 1149211: 943724 | 943725