diff options
author | cvs2svn <cvs2svn@FreeBSD.org> | 2009-04-28 21:27:54 +0000 |
---|---|---|
committer | cvs2svn <cvs2svn@FreeBSD.org> | 2009-04-28 21:27:54 +0000 |
commit | b6bb8c3d3a17625aa826094130b3d84530b6dae4 (patch) | |
tree | f2de4a4d4b2f5c3fcbd1ee2ea6cce6d571bfb5f7 /www/firefox-esr/files/patch-ff-485286 | |
parent | - Fix PLIST (diff) |
This commit was manufactured by cvs2svn to create tag 'RELEASE_7_2_0'.release/7.2.0
Notes
Notes:
svn path=/head/; revision=232918
svn path=/tags/RELEASE_7_2_0/; revision=232919; tag=release/7.2.0
Diffstat (limited to 'www/firefox-esr/files/patch-ff-485286')
-rw-r--r-- | www/firefox-esr/files/patch-ff-485286 | 40 |
1 files changed, 0 insertions, 40 deletions
diff --git a/www/firefox-esr/files/patch-ff-485286 b/www/firefox-esr/files/patch-ff-485286 deleted file mode 100644 index 1ec049793617..000000000000 --- a/www/firefox-esr/files/patch-ff-485286 +++ /dev/null @@ -1,40 +0,0 @@ -Bug 485286 - Allocate all of these consistently. r+sr=peterv/sicking a=ss - -diff --git a/extensions/transformiix/source/xslt/functions/txKeyFunctionCall.cpp b/extensions/transformiix/source/xslt/functions/txKeyFunctionCall.cpp ---- extensions/transformiix/source/xslt/functions/txKeyFunctionCall.cpp -+++ extensions/transformiix/source/xslt/functions/txKeyFunctionCall.cpp -@@ -401,26 +401,30 @@ nsresult txXSLKey::testNode(const txXPat - txExecutionState& aEs) - { - nsAutoString val; - txListIterator iter(&mKeys); - while (iter.hasNext()) - { - Key* key = (Key*)iter.next(); - if (key->matchPattern->matches(aNode, &aEs)) { -- txSingleNodeContext evalContext(aNode, &aEs); -- nsresult rv = aEs.pushEvalContext(&evalContext); -+ txSingleNodeContext *evalContext = -+ new txSingleNodeContext(aNode, &aEs); -+ NS_ENSURE_TRUE(evalContext, NS_ERROR_OUT_OF_MEMORY); -+ -+ nsresult rv = aEs.pushEvalContext(evalContext); - NS_ENSURE_SUCCESS(rv, rv); - - nsRefPtr<txAExprResult> exprResult; -- rv = key->useExpr->evaluate(&evalContext, -+ rv = key->useExpr->evaluate(evalContext, - getter_AddRefs(exprResult)); -- aEs.popEvalContext(); - NS_ENSURE_SUCCESS(rv, rv); - -+ delete aEs.popEvalContext(); -+ - if (exprResult->getResultType() == txAExprResult::NODESET) { - txNodeSet* res = NS_STATIC_CAST(txNodeSet*, - NS_STATIC_CAST(txAExprResult*, - exprResult)); - PRInt32 i; - for (i = 0; i < res->size(); ++i) { - val.Truncate(); - txXPathNodeUtils::appendNodeValue(res->get(i), val); |