Plug resource leaks

6 files changed, 21 insertions, 25 deletions

diff --git a/base/java-tools/src/com/netscape/cmstools/BtoA.java b/base/java-tools/src/com/netscape/cmstools/BtoA.java
index 8c240dac6..ac4e38942 100644
--- a/base/java-tools/src/com/netscape/cmstools/BtoA.java
+++ b/base/java-tools/src/com/netscape/cmstools/BtoA.java
@@ -82,6 +82,10 @@ public class BtoA {
         } catch (IOException e) {
             System.out.println("BtoA():  unable to open file " +
                     argv[1] + " for writing:\n" + e);
+            try {
+                inputBlob.close();
+            } catch (IOException e1) {
+            }
             return;
         }
 
diff --git a/base/java-tools/src/com/netscape/cmstools/DRMTool.java b/base/java-tools/src/com/netscape/cmstools/DRMTool.java
index 4403dc8ec..13f426eb9 100644
--- a/base/java-tools/src/com/netscape/cmstools/DRMTool.java
+++ b/base/java-tools/src/com/netscape/cmstools/DRMTool.java
@@ -1828,7 +1828,6 @@ public class DRMTool {
         KeyWrapper target_rsaWrap = null;
         byte target_session[] = null;
         DerOutputStream tmp = null;
-        DerOutputStream out = null;
         byte[] rewrappedKeyData = null;
 
         // public byte[]
@@ -1909,7 +1908,7 @@ public class DRMTool {
         // public byte[]
         // mStorageUnit.encryptInternalPrivate( byte priKey[] )
         // throws EBaseException
-        try {
+        try (DerOutputStream out = new DerOutputStream()) {
             // Use "mSourceToken" to get "KeyWrapAlgorithm.RSA"
             target_rsaWrap = mSourceToken.getKeyWrapper(
                                  KeyWrapAlgorithm.RSA);
@@ -1917,7 +1916,6 @@ public class DRMTool {
             target_session = target_rsaWrap.wrap(sk);
 
             tmp = new DerOutputStream();
-            out = new DerOutputStream();
 
             tmp.putOctetString(target_session);
             tmp.putOctetString(pri);
diff --git a/base/java-tools/src/com/netscape/cmstools/ExtJoiner.java b/base/java-tools/src/com/netscape/cmstools/ExtJoiner.java
index 5aac69e60..fed33d2dd 100644
--- a/base/java-tools/src/com/netscape/cmstools/ExtJoiner.java
+++ b/base/java-tools/src/com/netscape/cmstools/ExtJoiner.java
@@ -68,7 +68,7 @@ import com.netscape.cmsutil.util.Utils;
 public class ExtJoiner {
 
     public static void main(String args[]) {
-        try {
+        try (DerOutputStream out = new DerOutputStream()) {
             if (args.length == 0) {
                 System.out.println("Usage:  ExtJoiner <ext_file0> <ext_file1> ... <ext_fileN>");
                 System.exit(0);
@@ -80,7 +80,6 @@ public class ExtJoiner {
 
                 exts[i] = new DerValue(data);
             }
-            DerOutputStream out = new DerOutputStream();
 
             out.putSequence(exts);
             System.out.println(Utils.base64encode(out.toByteArray()));
diff --git a/base/java-tools/src/com/netscape/cmstools/GenExtKeyUsage.java b/base/java-tools/src/com/netscape/cmstools/GenExtKeyUsage.java
index 9476d3ee4..f8d4899fc 100644
--- a/base/java-tools/src/com/netscape/cmstools/GenExtKeyUsage.java
+++ b/base/java-tools/src/com/netscape/cmstools/GenExtKeyUsage.java
@@ -19,13 +19,13 @@ package com.netscape.cmstools;
 
 import java.util.Vector;
 
-import com.netscape.cmsutil.util.Utils;
-
 import netscape.security.util.DerOutputStream;
 import netscape.security.util.DerValue;
 import netscape.security.util.ObjectIdentifier;
 import netscape.security.x509.Extension;
 
+import com.netscape.cmsutil.util.Utils;
+
 /**
  * Generates a DER-encoded Extended Key Usage extension.
  * The first parameter is the criticality of the extension, true or false.
@@ -38,7 +38,8 @@ import netscape.security.x509.Extension;
 public class GenExtKeyUsage {
 
     public static void main(String[] args) {
-        try {
+        try (DerOutputStream seq = new DerOutputStream();
+             DerOutputStream octetString = new DerOutputStream()) {
             if (args.length < 2) {
                 System.out.println("Usage:  GenExtKeyUsage [true|false] <OID> ...");
                 System.exit(-1);
@@ -72,13 +73,9 @@ public class GenExtKeyUsage {
             }
 
             // stuff the object identifiers into a SEQUENCE
-            DerOutputStream seq = new DerOutputStream();
-
             seq.write(DerValue.tag_Sequence, contents);
 
             // encode the SEQUENCE in an octet string
-            DerOutputStream octetString = new DerOutputStream();
-
             octetString.putOctetString(seq.toByteArray());
 
             // Construct an extension
diff --git a/base/java-tools/src/com/netscape/cmstools/PKCS10Client.java b/base/java-tools/src/com/netscape/cmstools/PKCS10Client.java
index a138ae29d..f3eac9ff4 100644
--- a/base/java-tools/src/com/netscape/cmstools/PKCS10Client.java
+++ b/base/java-tools/src/com/netscape/cmstools/PKCS10Client.java
@@ -88,7 +88,7 @@ public class PKCS10Client {
     }
 
     public static void main(String args[]) throws Exception {
-        String dbdir = null, ofilename = null, password = null, subjectName = null, type = null, tokenName = null;
+        String dbdir = null, ofilename = null, password = null, subjectName = null, tokenName = null;
 
         String alg = "rsa";
         String ecc_curve = "nistp256";
diff --git a/base/java-tools/src/com/netscape/cmstools/PasswordCache.java b/base/java-tools/src/com/netscape/cmstools/PasswordCache.java
index d97a21706..3a4f29c11 100644
--- a/base/java-tools/src/com/netscape/cmstools/PasswordCache.java
+++ b/base/java-tools/src/com/netscape/cmstools/PasswordCache.java
@@ -127,18 +127,16 @@ public class PasswordCache {
         // All this streaming is lame, but Base64OutputStream needs a
         // PrintStream
         ByteArrayOutputStream output = new ByteArrayOutputStream();
-        Base64OutputStream b64 = new Base64OutputStream(new
-                PrintStream(new
-                        FilterOutputStream(output)
-                )
-                );
-
-        b64.write(bytes);
-        b64.flush();
-
-        // This is internationally safe because Base64 chars are
-        // contained within 8859_1
-        return output.toString("8859_1");
+        try (Base64OutputStream b64 = new Base64OutputStream(
+                new PrintStream(new FilterOutputStream(output)))) {
+
+            b64.write(bytes);
+            b64.flush();
+
+            // This is internationally safe because Base64 chars are
+            // contained within 8859_1
+            return output.toString("8859_1");
+        }
     }
 
     public static void main(String[] av) {