Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-17 15:25:52 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fixing bug 333674. We leak oldVal on OOM in nsUint32ToContentHashEntry::PutContent. r+sr=bzbarsky@mit.edu

Browse Source
This commit is contained in:
jwatt%jwatt.org 2006-04-12 12:11:40 +00:00
parent 4b83a22732
commit 4252d4d43e
1 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
content/base/src/nsDocument.cpp
View File

@ -183,14 +183,21 @@ nsUint32ToContentHashEntry::PutContent(nsIContent* aVal)
}
// If an element is already there, create a hashtable and both of these to it
if (GetContent()) {
nsIContent* oldVal = GetContent();
if (oldVal) {
nsresult rv = InitHashSet(&set);
NS_ENSURE_SUCCESS(rv, rv);
nsISupportsHashKey* entry = set->PutEntry(oldVal);
if (!entry)
if (!entry) {
// OOM - we can't insert aVal, but we can at least put oldVal back (even
// if we didn't, we'd still have to release oldVal so that we don't leak)
delete set;
SetContent(oldVal);
// SetContent adds another reference, so release the one we had
NS_RELEASE(oldVal);
return NS_ERROR_OUT_OF_MEMORY;
}
// The hashset adds its own reference, so release the one we had
NS_RELEASE(oldVal);