Fixed resource leak in ExtendedKeyUsageExtension.

The ExtendedKeyUsageExtension has been modified to always close
the DerOutputStream instance.

The ExtendedKeyUsageExt has been modified to wrap the original
exception.

https://fedorahosted.org/pki/ticket/2530

1 files changed, 5 insertions, 3 deletions

diff --git a/base/util/src/netscape/security/extensions/ExtendedKeyUsageExtension.java b/base/util/src/netscape/security/extensions/ExtendedKeyUsageExtension.java
index a966ca1db..c9c8acfab 100644
--- a/base/util/src/netscape/security/extensions/ExtendedKeyUsageExtension.java
+++ b/base/util/src/netscape/security/extensions/ExtendedKeyUsageExtension.java
@@ -66,11 +66,11 @@ public class ExtendedKeyUsageExtension extends Extension implements CertAttrSet
         }
     }
 
-    public ExtendedKeyUsageExtension() {
+    public ExtendedKeyUsageExtension() throws IOException {
         this(false, null);
     }
 
-    public ExtendedKeyUsageExtension(boolean crit, Vector<ObjectIdentifier> oids) {
+    public ExtendedKeyUsageExtension(boolean crit, Vector<ObjectIdentifier> oids) throws IOException {
         try {
             extensionId = ObjectIdentifier.getObjectIdentifier(OID);
         } catch (IOException e) {
@@ -200,7 +200,7 @@ public class ExtendedKeyUsageExtension extends Extension implements CertAttrSet
         }
     }
 
-    private void encodeExtValue() {
+    private void encodeExtValue() throws IOException {
         DerOutputStream out = new DerOutputStream();
         DerOutputStream temp = new DerOutputStream();
 
@@ -219,6 +219,8 @@ public class ExtendedKeyUsageExtension extends Extension implements CertAttrSet
         try {
             out.write(DerValue.tag_Sequence, temp);
         } catch (IOException ex) {
+        } finally {
+            out.close();
         }
 
         extensionValue = out.toByteArray();