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, 11 insertions, 7 deletions

diff --git a/base/server/cms/src/com/netscape/cms/policy/extensions/ExtendedKeyUsageExt.java b/base/server/cms/src/com/netscape/cms/policy/extensions/ExtendedKeyUsageExt.java
index 5f33efe1b..4ba834dbe 100644
--- a/base/server/cms/src/com/netscape/cms/policy/extensions/ExtendedKeyUsageExt.java
+++ b/base/server/cms/src/com/netscape/cms/policy/extensions/ExtendedKeyUsageExt.java
@@ -22,12 +22,6 @@ import java.security.cert.CertificateException;
 import java.util.Locale;
 import java.util.Vector;
 
-import netscape.security.extensions.ExtendedKeyUsageExtension;
-import netscape.security.util.ObjectIdentifier;
-import netscape.security.x509.CertificateExtensions;
-import netscape.security.x509.CertificateVersion;
-import netscape.security.x509.X509CertInfo;
-
 import com.netscape.certsrv.apps.CMS;
 import com.netscape.certsrv.base.EBaseException;
 import com.netscape.certsrv.base.IConfigStore;
@@ -39,6 +33,12 @@ import com.netscape.certsrv.request.IRequest;
 import com.netscape.certsrv.request.PolicyResult;
 import com.netscape.cms.policy.APolicyRule;
 
+import netscape.security.extensions.ExtendedKeyUsageExtension;
+import netscape.security.util.ObjectIdentifier;
+import netscape.security.x509.CertificateExtensions;
+import netscape.security.x509.CertificateVersion;
+import netscape.security.x509.X509CertInfo;
+
 /**
  * This implements the extended key usage extension.
  * <P>
@@ -84,7 +84,11 @@ public class ExtendedKeyUsageExt extends APolicyRule
         mConfig = config;
         setExtendedPluginInfo();
         setupParams();
-        mExtendedKeyUsage = new ExtendedKeyUsageExtension(mCritical, mUsages);
+        try {
+            mExtendedKeyUsage = new ExtendedKeyUsageExtension(mCritical, mUsages);
+        } catch (IOException e) {
+            throw new EBaseException(e);
+        }
     }
 
     /**