[tomcat] branch 8.5.x updated: Fix resource leak on exception path

[markt]

This is an automated email from the ASF dual-hosted git repository.

markt pushed a commit to branch 8.5.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git


The following commit(s) were added to refs/heads/8.5.x by this push:
     new 020a8d2  Fix resource leak on exception path
020a8d2 is described below

commit 020a8d2e9f2d3d6b4db0620330cf5640c6f4da79
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Wed Apr 17 17:55:16 2019 +0100

    Fix resource leak on exception path
    
    Identified by Coverity scan
---
 java/org/apache/naming/factory/LookupFactory.java | 8 ++++++++
 webapps/docs/changelog.xml                        | 4 ++++
 2 files changed, 12 insertions(+)

diff --git a/java/org/apache/naming/factory/LookupFactory.java 
b/java/org/apache/naming/factory/LookupFactory.java
index 190b7e3..ba47699 100644
--- a/java/org/apache/naming/factory/LookupFactory.java
+++ b/java/org/apache/naming/factory/LookupFactory.java
@@ -134,6 +134,14 @@ public class LookupFactory implements ObjectFactory {
                             name, ref.getClassName(), lookupName, 
result.getClass().getName());
                     NamingException ne = new NamingException(msg);
                     log.warn(msg, ne);
+                    // Close the resource we no longer need if we know how to 
do so
+                    if (result instanceof AutoCloseable) {
+                        try {
+                            ((AutoCloseable) result).close();
+                        } catch (Exception e) {
+                            // Ignore
+                        }
+                    }
                     throw ne;
                 }
             } finally {
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index c3ce6cc..3354ad8 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -71,6 +71,10 @@
         Fix a potential resource leak on an exception path when parsing JSP
         files. Identified by Coverity scan. (markt)
       </fix>
+      <fix>
+        Fix a potential resource leak when a JNDI lookup returns an object of 
an
+        in compatible class. Identified by Coverity scan. (markt)
+      </fix>
     </changelog>
   </subsection>
 </section>


---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org