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

Bug 333704: fix leak of key in txNodeSorter::addSortElement, patch by Ryan Jones <sciguyryan+bugzilla@gmail.com>, r+sr=sicking

Browse Source
This commit is contained in:
gavin%gavinsharp.com 2006-11-06 14:54:01 +00:00
parent 7d6325aee3
commit 2cb00ac91c
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
content/xslt/src/xslt/txNodeSorter.cpp
View File

@ -70,7 +70,7 @@ txNodeSorter::addSortElement(Expr* aSelectExpr, Expr* aLangExpr,
Expr* aDataTypeExpr, Expr* aOrderExpr,
Expr* aCaseOrderExpr, txIEvalContext* aContext)
{
SortKey* key = new SortKey;
nsAutoPtr<SortKey> key(new SortKey);
NS_ENSURE_TRUE(key, NS_ERROR_OUT_OF_MEMORY);
nsresult rv = NS_OK;
@ -88,7 +88,6 @@ txNodeSorter::addSortElement(Expr* aSelectExpr, Expr* aLangExpr,
ascending = MB_FALSE;
}
else if (!TX_StringEqualsAtom(attrValue, txXSLTAtoms::ascending)) {
delete key;
// XXX ErrorReport: unknown value for order attribute
return NS_ERROR_XSLT_BAD_VALUE;
}
@ -125,7 +124,6 @@ txNodeSorter::addSortElement(Expr* aSelectExpr, Expr* aLangExpr,
}
else if (!TX_StringEqualsAtom(attrValue,
txXSLTAtoms::lowerFirst)) {
delete key;
// XXX ErrorReport: unknown value for case-order attribute
return NS_ERROR_XSLT_BAD_VALUE;
}
@ -143,12 +141,14 @@ txNodeSorter::addSortElement(Expr* aSelectExpr, Expr* aLangExpr,
}
else {
// XXX ErrorReport: unknown data-type
delete key;
return NS_ERROR_XSLT_BAD_VALUE;
}
mSortKeys.add(key);
// mSortKeys owns key now.
rv = mSortKeys.add(key);
NS_ENSURE_SUCCESS(rv, rv);
key.forget();
mNKeys++;
return NS_OK;