Fix for resource leak on exception (#917)

* Using try-with-resources to avoid resource leak * Reader closing in finnaly block
java-native-access · Feb 5, 2018 · c333527 · c333527
1 parent 1ad4606
commit c333527
Showing 1 changed file with 20 additions and 13 deletions.
diff --git a/src/com/sun/jna/NativeLibrary.java b/src/com/sun/jna/NativeLibrary.java
@@ -959,22 +959,29 @@ else if (Platform.ARCH.equals("mips64el")) {
      */
     private static ArrayList<String> getLinuxLdPaths() {
         ArrayList<String> ldPaths = new ArrayList<String>();
+        BufferedReader reader = null;
         try {
-                Process process = Runtime.getRuntime().exec("/sbin/ldconfig -p");
-                BufferedReader reader = new BufferedReader(new InputStreamReader(process.getInputStream()));
-                String buffer = "";
-                while ((buffer = reader.readLine()) != null) {
-                        int startPath = buffer.indexOf(" => ");
-                        int endPath = buffer.lastIndexOf('/');
-                        if (startPath != -1 && endPath != -1 && startPath < endPath) {
-                                String path =  buffer.substring(startPath+4, endPath);
-                                if (ldPaths.contains(path) == false) {
-                                        ldPaths.add(path);
-                                }
-                        }
+            Process process = Runtime.getRuntime().exec("/sbin/ldconfig -p");
+            reader = new BufferedReader(new InputStreamReader(process.getInputStream()));
+            String buffer;
+            while ((buffer = reader.readLine()) != null) {
+                int startPath = buffer.indexOf(" => ");
+                int endPath = buffer.lastIndexOf('/');
+                if (startPath != -1 && endPath != -1 && startPath < endPath) {
+                    String path = buffer.substring(startPath + 4, endPath);
+                    if (!ldPaths.contains(path)) {
+                        ldPaths.add(path);
+                    }
                 }
-                reader.close();
+            }
         } catch (Exception e) {
+        } finally {
+            if(reader != null) {
+                try {
+                    reader.close();
+                } catch (IOException e) {
+                }
+            }
         }
         return ldPaths;
     }