Bommels05/Mozilla
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Bug 211277 nsPersistentProperties::nsPersistentProperties doesn't check the return value of PL_DHashTableInit

Browse Source 
r=alecf sr=dbaron


git-svn-id: svn://10.0.0.236/trunk@144839 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
timeless%mozdev.org
2003-07-14 21:07:31 +00:00
parent ced70ba321
commit 0b7361d0c0
2 changed files with 24 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
mozilla/xpcom/ds/nsPersistentProperties.cpp
View File

@@ -118,20 +118,29 @@ static const struct PLDHashTableOps property_HashTableOps = {
};
nsPersistentProperties::nsPersistentProperties()
: mIn(nsnull)
{
mIn = nsnull;
mSubclass = NS_STATIC_CAST(nsIPersistentProperties*, this);
PL_DHashTableInit(&mTable, &property_HashTableOps, nsnull,
sizeof(propertyTableEntry), 20);
PL_INIT_ARENA_POOL(&mArena, "PersistentPropertyArena", 2048);
mSubclass = NS_STATIC_CAST(nsIPersistentProperties*, this);
mTable.ops = nsnull;
PL_INIT_ARENA_POOL(&mArena, "PersistentPropertyArena", 2048);
}
nsPersistentProperties::~nsPersistentProperties()
{
PL_FinishArenaPool(&mArena);
PL_DHashTableFinish(&mTable);
if (mTable.ops)
PL_DHashTableFinish(&mTable);
}
nsresult
nsPersistentProperties::Init()
{
if (!PL_DHashTableInit(&mTable, &property_HashTableOps, nsnull,
sizeof(propertyTableEntry), 20)) {
mTable.ops = nsnull;
return NS_ERROR_OUT_OF_MEMORY;
}
return NS_OK;
}
NS_METHOD
@@ -142,8 +151,12 @@ nsPersistentProperties::Create(nsISupports *aOuter, REFNSIID aIID, void **aResul
nsPersistentProperties* props = new nsPersistentProperties();
if (props == nsnull)
return NS_ERROR_OUT_OF_MEMORY;
NS_ADDREF(props);
nsresult rv = props->QueryInterface(aIID, aResult);
nsresult rv = props->Init();
if (NS_SUCCEEDED(rv))
rv = props->QueryInterface(aIID, aResult);
NS_RELEASE(props);
return rv;
}
@@ -355,7 +368,7 @@ nsPersistentProperties::Enumerate(nsISimpleEnumerator** aResult)
// Step through hash entries populating a transient array
PRUint32 n =
PL_DHashTableEnumerate(&mTable, AddElemToArray, (void *)propArray);
if ( n < (PRIntn) mTable.entryCount )
if ( n < mTable.entryCount )
return NS_ERROR_OUT_OF_MEMORY;
return NS_NewArrayEnumerator(aResult, propArray);

1
mozilla/xpcom/ds/nsPersistentProperties.h
View File

@@ -53,6 +53,7 @@ class nsPersistentProperties : public nsIPersistentProperties
public:
nsPersistentProperties();
virtual ~nsPersistentProperties();
nsresult Init();
NS_DECL_ISUPPORTS
NS_DECL_NSIPROPERTIES