Fix certlist memory leak.

1 files changed, 9 insertions, 0 deletions

diff --git a/security/nss/lib/smime/cmssiginfo.c b/security/nss/lib/smime/cmssiginfo.c
index 7c3e96b01..e695bb75d 100644
--- a/security/nss/lib/smime/cmssiginfo.c
+++ b/security/nss/lib/smime/cmssiginfo.c
@@ -110,6 +110,9 @@ NSS_CMSSignerInfo_Destroy(NSSCMSSignerInfo *si)
     if (si->cert != NULL)
 	CERT_DestroyCertificate(si->cert);
 
+    if (si->certList != NULL) 
+	CERT_DestroyCertList(si->certList);
+
     /* XXX storage ??? */
 }
 
@@ -854,6 +857,12 @@ NSS_CMSSignerInfo_IncludeCerts(NSSCMSSignerInfo *signerinfo, NSSCMSCertChainMode
     if (signerinfo->cert == NULL)
 	return SECFailure;
 
+    /* don't leak if we get called twice */
+    if (signerinfo->certList != NULL) {
+	CERT_DestroyCertList(signerinfo->certList);
+	signerinfo->certList = NULL;
+    }
+
     switch (cm) {
     case NSSCMSCM_None:
 	signerinfo->certList = NULL;