[CID-152201] - Fix resource leak in remoting.jnlp.Main (#102)

jenkinsci · Aug 26, 2016 · 8fbc76c · 8fbc76c
1 parent 98107a2
commit 8fbc76c
Showing 1 changed file with 7 additions and 3 deletions.
diff --git a/src/main/java/hudson/remoting/jnlp/Main.java b/src/main/java/hudson/remoting/jnlp/Main.java
@@ -190,14 +190,18 @@ public Engine createEngine() {
                     if (file.isFile()
                             && (length = file.length()) < 65536
                             && length > "-----BEGIN CERTIFICATE-----\n-----END CERTIFICATE-----".length()) {
-                        FileInputStream fis = null;
                         try {
                             // we do basic size validation, if there are x509 certificates that have a PEM encoding
                             // larger
                             // than 64kb we can revisit the upper bound.
                             cert = new byte[(int) length];
-                            fis = new FileInputStream(file);
-                            int read = fis.read(cert);
+                            FileInputStream fis = new FileInputStream(file);
+                            final int read;
+                            try {
+                                read = fis.read(cert);
+                            } finally {
+                                fis.close();
+                            }
                             if (cert.length != read) {
                                 LOGGER.log(Level.WARNING, "Only read {0} bytes from {1}, expected to read {2}",
                                         new Object[]{read, file, cert.length});