Merge pull request #2793 from oleg-nenashev/bug/JENKINS-42670-Windows…

…InstallerLink_leak [JENKINS-42670] - Fix the potential File descriptor leak in the Windows Service installer
jenkinsci · Mar 11, 2017 · 3544af8 · 3544af8
2 parents 6e39dd3 + e63774d
commit 3544af8
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/core/src/main/java/hudson/lifecycle/WindowsInstallerLink.java b/core/src/main/java/hudson/lifecycle/WindowsInstallerLink.java
@@ -306,9 +306,9 @@ static int runElevated(File jenkinsExe, String command, TaskListener out, File p
         try {
             return Kernel32Utils.waitForExitProcess(sei.hProcess);
         } finally {
-            FileInputStream fin = new FileInputStream(new File(pwd,"redirect.log"));
-            IOUtils.copy(fin, out.getLogger());
-            fin.close();
+            try (FileInputStream fin = new FileInputStream(new File(pwd,"redirect.log"))) {
+                IOUtils.copy(fin, out.getLogger());
+            }
         }
     }