diff options
| author | Abhishek Koneru <akoneru@redhat.com> | 2012-06-18 14:08:21 -0400 |
|---|---|---|
| committer | Endi Sukma Dewata <edewata@redhat.com> | 2012-06-21 15:18:59 -0500 |
| commit | de3aaef15e9b1f192344019f52d6c80860055b5e (patch) | |
| tree | 595eec5aa554091f4a21cf9bc6bf6698e747bf23 /base/java-tools | |
| parent | 3153fa5ba15d402b4729a649737d02eead5a5064 (diff) | |
| download | pki-de3aaef15e9b1f192344019f52d6c80860055b5e.tar.gz pki-de3aaef15e9b1f192344019f52d6c80860055b5e.tar.xz pki-de3aaef15e9b1f192344019f52d6c80860055b5e.zip | |
Fixes for Resource Leaks shown in Coverity for DogTag 10
Diffstat (limited to 'base/java-tools')
| -rw-r--r-- | base/java-tools/src/com/netscape/cmstools/DRMTool.java | 27 | ||||
| -rw-r--r-- | base/java-tools/src/com/netscape/cmstools/PKCS12Export.java | 11 |
2 files changed, 37 insertions, 1 deletions
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; |