From de3aaef15e9b1f192344019f52d6c80860055b5e Mon Sep 17 00:00:00 2001
From: Abhishek Koneru <akoneru@redhat.com>
Date: Mon, 18 Jun 2012 14:08:21 -0400
Subject: Fixes for Resource Leaks shown in Coverity for DogTag 10

---
 .../src/com/netscape/cmstools/DRMTool.java         | 27 ++++++++++++++++++++++
 .../src/com/netscape/cmstools/PKCS12Export.java    | 11 ++++++++-
 2 files changed, 37 insertions(+), 1 deletion(-)

(limited to 'base/java-tools')

diff --git a/base/java-tools/src/com/netscape/cmstools/DRMTool.java b/base/java-tools/src/com/netscape/cmstools/DRMTool.java
index 0eaf26ee1..9fbab5da6 100644
--- a/base/java-tools/src/com/netscape/cmstools/DRMTool.java
+++ b/base/java-tools/src/com/netscape/cmstools/DRMTool.java
@@ -1657,6 +1657,14 @@ public class DRMTool {
                             + "'"
                             + NEWLINE, true);
                     System.exit(0);
+                } finally {
+                    if (in != null) {
+                        try {
+                            in.close();
+                        } catch (IOException e) {
+                            e.printStackTrace();
+                        }
+                    }
                 }
             }
         } catch (Exception exUninitialized) {
@@ -4291,6 +4299,17 @@ public class DRMTool {
                     + "'"
                     + NEWLINE, true);
             return FAILURE;
+        } finally {
+            if (reader != null) {
+                try {
+                    reader.close();
+                } catch (IOException e) {
+                    e.printStackTrace();
+                }
+            }
+            if (writer != null) {
+                writer.close();
+            }
         }
 
         return SUCCESS;
@@ -4401,6 +4420,14 @@ public class DRMTool {
                     + "'"
                     + NEWLINE, true);
             return FAILURE;
+        } finally {
+            if (reader != null) {
+                try {
+                    reader.close();
+                } catch (IOException e) {
+                    e.printStackTrace();
+                }
+            }
         }
 
         return SUCCESS;
diff --git a/base/java-tools/src/com/netscape/cmstools/PKCS12Export.java b/base/java-tools/src/com/netscape/cmstools/PKCS12Export.java
index 532505867..df19bd9fe 100644
--- a/base/java-tools/src/com/netscape/cmstools/PKCS12Export.java
+++ b/base/java-tools/src/com/netscape/cmstools/PKCS12Export.java
@@ -233,8 +233,9 @@ public class PKCS12Export {
         }
 
         String pk12pwd = null;
+        BufferedReader in = null;
         try {
-            BufferedReader in = new BufferedReader(new FileReader(pk12pwdfile));
+            in = new BufferedReader(new FileReader(pk12pwdfile));
             pk12pwd = in.readLine();
             if (pk12pwd == null) {
                 pk12pwd = "";
@@ -242,6 +243,14 @@ public class PKCS12Export {
         } catch (Exception e) {
             debug("Failed to read the keydb password from the file. Exception: " + e.toString());
             System.exit(1);
+        } finally {
+            if (in != null) {
+                try {
+                    in.close();
+                } catch (IOException e) {
+                    e.printStackTrace();
+                }
+            }
         }
 
         CryptoManager cm = null;
-- 
cgit