Fixes for Coverity issues of type Resource Leaks - Remaining

2 files changed, 81 insertions, 55 deletions

diff --git a/base/util/src/netscape/security/extensions/GenericASN1Extension.java b/base/util/src/netscape/security/extensions/GenericASN1Extension.java
index 78d294573..b51846498 100644
--- a/base/util/src/netscape/security/extensions/GenericASN1Extension.java
+++ b/base/util/src/netscape/security/extensions/GenericASN1Extension.java
@@ -419,31 +419,37 @@ public class GenericASN1Extension extends Extension
         }
 
         FileInputStream fis = new FileInputStream(fname);
-        int n = 0;
-        while ((n = fis.available()) > 0) {
-            buff = new byte[n];
-            int result = fis.read(buff);
-            if (result == -1)
-                break;
-            s = new String(buff);
-        }
+        try {
+            int n = 0;
+            while ((n = fis.available()) > 0) {
+                buff = new byte[n];
+                int result = fis.read(buff);
+                if (result == -1)
+                    break;
+                s = new String(buff);
+            }
 
-        for (i = 0, j = 0; j < s.length(); j++) {
-            int ch = s.charAt(j);
-            if (ch == 10 || ch == 13 || ch == 9)
-                continue;
-            i++;
-        }
-        buff = new byte[i];
-        for (i = 0, j = 0; j < s.length(); j++) {
-            int ch = s.charAt(j);
-            if (ch == 10 || ch == 13 || ch == 9)
-                continue;
-            buff[i++] = (byte) ch;
-        }
+            for (i = 0, j = 0; j < s.length(); j++) {
+                int ch = s.charAt(j);
+                if (ch == 10 || ch == 13 || ch == 9)
+                    continue;
+                i++;
+            }
+            buff = new byte[i];
+            for (i = 0, j = 0; j < s.length(); j++) {
+                int ch = s.charAt(j);
+                if (ch == 10 || ch == 13 || ch == 9)
+                    continue;
+                buff[i++] = (byte) ch;
+            }
 
-        s = new String(buff);
+            s = new String(buff);
 
-        return s;
+            return s;
+        } finally {
+            if (fis != null) {
+                fis.close();
+            }
+        }
     }
 }
diff --git a/base/util/src/netscape/security/extensions/PresenceServerExtension.java b/base/util/src/netscape/security/extensions/PresenceServerExtension.java
index 276c91547..5ee802468 100644
--- a/base/util/src/netscape/security/extensions/PresenceServerExtension.java
+++ b/base/util/src/netscape/security/extensions/PresenceServerExtension.java
@@ -259,7 +259,7 @@ public class PresenceServerExtension extends Extension implements CertAttrSet {
     public void setOID(String oid) {
     }
 
-    public static void main(String args[]) throws Exception {
+    public static void main(String args[]) {
         /*
            0 30  115: SEQUENCE {
            2 06    9:   OBJECT IDENTIFIER '2 16 840 1 113730 1 100'
@@ -285,36 +285,56 @@ public class PresenceServerExtension extends Extension implements CertAttrSet {
                     :       }
                     :   }
          */
-        boolean critical = false;
-        int version = 1;
-        String streetAddress = "401E Middlefield Rd.,MV,CA94041";
-        String telephoneNumber = "650-111-1111";
-        String rfc822Name = "admin@netscape.com";
-        String ID = "ps-capitol";
-        String hostName = "capitol";
-        int portNumber = 80;
-        int maxUsers = 10;
-        int serviceLevel = 1;
-
-        PresenceServerExtension ext = new PresenceServerExtension(
-                critical,
-                version, streetAddress, telephoneNumber,
-                rfc822Name, ID, hostName, portNumber,
-                maxUsers, serviceLevel);
-
-        // encode
-
-        ByteArrayOutputStream dos = new ByteArrayOutputStream();
-        ext.encode(dos);
-        FileOutputStream fos = new FileOutputStream("pse.der");
-        fos.write(dos.toByteArray());
-        fos.close();
-
-        Extension ext1 = new Extension(new DerValue(dos.toByteArray()));
-
-        @SuppressWarnings("unused")
-        PresenceServerExtension ext2 = new PresenceServerExtension(
-                Boolean.valueOf(false), ext1.getExtensionValue());
-
+        ByteArrayOutputStream dos = null;
+        FileOutputStream fos = null;
+        try {
+            boolean critical = false;
+            int version = 1;
+            String streetAddress = "401E Middlefield Rd.,MV,CA94041";
+            String telephoneNumber = "650-111-1111";
+            String rfc822Name = "admin@netscape.com";
+            String ID = "ps-capitol";
+            String hostName = "capitol";
+            int portNumber = 80;
+            int maxUsers = 10;
+            int serviceLevel = 1;
+
+            PresenceServerExtension ext = new PresenceServerExtension(
+                    critical,
+                    version, streetAddress, telephoneNumber,
+                    rfc822Name, ID, hostName, portNumber,
+                    maxUsers, serviceLevel);
+
+            // encode
+
+            dos = new ByteArrayOutputStream();
+            ext.encode(dos);
+            fos = new FileOutputStream("pse.der");
+            fos.write(dos.toByteArray());
+            Extension ext1 = new Extension(new DerValue(dos.toByteArray()));
+
+            @SuppressWarnings("unused")
+            PresenceServerExtension ext2 = new PresenceServerExtension(
+                    Boolean.valueOf(false), ext1.getExtensionValue());
+        } catch (IOException e) {
+            e.printStackTrace();
+        } catch (CertificateException e) {
+            e.printStackTrace();
+        } finally {
+            if (dos != null) {
+                try {
+                    dos.close();
+                } catch (IOException e) {
+                    e.printStackTrace();
+                }
+            }
+            if (fos != null) {
+                try {
+                    fos.close();
+                } catch (IOException e) {
+                    e.printStackTrace();
+                }
+            }
+        }
     }
 }