Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2025-02-14 04:03:47 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 211291 void nsCertTree::InitCompareHash doesn't check the return value of PL_DHashTableInit

Browse Source 
r=kaie sr=bz
This commit is contained in:
timeless%mozdev.org 2003-09-11 01:59:21 +00:00
parent 74241f4276
commit 7584920b89
2 changed files with 14 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
security/manager/ssl/src/nsCertTree.cpp
View File

@ -133,11 +133,15 @@ void nsCertTree::ClearCompareHash()
}
}
void nsCertTree::InitCompareHash()
nsresult nsCertTree::InitCompareHash()
{
ClearCompareHash();
PL_DHashTableInit(&mCompareCache, &gMapOps, nsnull,
sizeof(CompareCacheHashEntry), 128);
if (!PL_DHashTableInit(&mCompareCache, &gMapOps, nsnull,
sizeof(CompareCacheHashEntry), 128)) {
mCompareCache.ops = nsnull;
return NS_ERROR_OUT_OF_MEMORY;
}
return NS_OK;
}
nsCertTree::~nsCertTree()
@ -352,14 +356,15 @@ nsCertTree::GetCertsByTypeFromCache(nsINSSCertCache *aCache,
NS_IMETHODIMP
nsCertTree::LoadCertsFromCache(nsINSSCertCache *aCache, PRUint32 aType)
{
nsresult rv;
if (mTreeArray) {
FreeCertArray();
delete [] mTreeArray;
mTreeArray = NULL;
mNumRows = 0;
}
InitCompareHash();
nsresult rv = InitCompareHash();
if (NS_FAILED(rv)) return rv;
rv = GetCertsByTypeFromCache(aCache, aType,
GetCompareFuncFromCertType(aType), &mCompareCache,
getter_AddRefs(mCertArray));
@ -370,14 +375,15 @@ nsCertTree::LoadCertsFromCache(nsINSSCertCache *aCache, PRUint32 aType)
NS_IMETHODIMP
nsCertTree::LoadCerts(PRUint32 aType)
{
nsresult rv;
if (mTreeArray) {
FreeCertArray();
delete [] mTreeArray;
mTreeArray = NULL;
mNumRows = 0;
}
InitCompareHash();
nsresult rv = InitCompareHash();
if (NS_FAILED(rv)) return rv;
rv = GetCertsByType(aType,
GetCompareFuncFromCertType(aType), &mCompareCache,
getter_AddRefs(mCertArray));

2
security/manager/ssl/src/nsCertTree.h
View File

@ -72,7 +72,7 @@ public:
sort_CommonName, sort_IssuedDateDescending, sort_Email, sort_None };
protected:
void InitCompareHash();
nsresult InitCompareHash();
void ClearCompareHash();
void RemoveCacheEntry(void *key);