From c4f5cc4c9deb98f32374e3f736786f882fe32bf2 Mon Sep 17 00:00:00 2001 From: "kaie%kuix.de" Date: Mon, 25 Jun 2007 18:56:30 +0000 Subject: [PATCH] Bug 379190, crashes when loading chrome urls r=rrelyea, a=dveditz git-svn-id: svn://10.0.0.236/branches/MOZILLA_1_8_BRANCH@228703 18797224-902f-48f8-a5cc-f745e15eee43 --- mozilla/security/manager/ssl/src/nsNSSCertificateDB.cpp | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/mozilla/security/manager/ssl/src/nsNSSCertificateDB.cpp b/mozilla/security/manager/ssl/src/nsNSSCertificateDB.cpp index 2f80c605448..fe36bb6001f 100644 --- a/mozilla/security/manager/ssl/src/nsNSSCertificateDB.cpp +++ b/mozilla/security/manager/ssl/src/nsNSSCertificateDB.cpp @@ -140,11 +140,15 @@ nsNSSCertificateDB::FindCertByDBKey(const char *aDBkey, nsISupports *aToken, CERTIssuerAndSN issuerSN; unsigned long moduleID,slotID; *_cert = nsnull; - if (!aDBkey) return NS_ERROR_FAILURE; + if (!aDBkey || !*aDBkey) + return NS_ERROR_FAILURE; + dummy = NSSBase64_DecodeBuffer(nsnull, &keyItem, aDBkey, (PRUint32)PL_strlen(aDBkey)); - CERTCertificate *cert; + if (!dummy) + return NS_ERROR_FAILURE; + CERTCertificate *cert; // someday maybe we can speed up the search using the moduleID and slotID moduleID = NS_NSS_GET_LONG(keyItem.data); slotID = NS_NSS_GET_LONG(&keyItem.data[NS_NSS_LONG]);