From 268f8a9402b0a6d3b57e9830e38bb90bb191d575 Mon Sep 17 00:00:00 2001 From: "nelsonb%netscape.com" Date: Sat, 15 Nov 2003 00:15:28 +0000 Subject: [PATCH] Detect empty emailAddr strings in CERTCertificate. Bugzilla bug 211540. git-svn-id: svn://10.0.0.236/trunk@149333 18797224-902f-48f8-a5cc-f745e15eee43 --- mozilla/security/nss/lib/pk11wrap/pk11cert.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/mozilla/security/nss/lib/pk11wrap/pk11cert.c b/mozilla/security/nss/lib/pk11wrap/pk11cert.c index 275fa3ac57b..d2b2cd57850 100644 --- a/mozilla/security/nss/lib/pk11wrap/pk11cert.c +++ b/mozilla/security/nss/lib/pk11wrap/pk11cert.c @@ -1681,7 +1681,7 @@ PK11_ImportCert(PK11SlotInfo *slot, CERTCertificate *cert, PK11_SETATTRS(attrs,CKA_NETSCAPE_TRUST, certUsage, sizeof(SECCertUsage)); attrs++; - if (cert->emailAddr) { + if (cert->emailAddr && cert->emailAddr[0]) { PK11_SETATTRS(attrs,CKA_NETSCAPE_EMAIL, cert->emailAddr, PORT_Strlen(cert->emailAddr); attrs++; @@ -1765,7 +1765,7 @@ done: goto loser; } - if (PK11_IsInternal(slot) && cert->emailAddr) { + if (PK11_IsInternal(slot) && cert->emailAddr && cert->emailAddr[0]) { emailAddr = cert->emailAddr; }