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

Bug 1311687 - Pop eval context on early returns. r=peterv

Browse Source 
Make sure the eval context stack is cleaned up on failure.

MozReview-Commit-ID: AUNen1xt9He

--HG--
extra : rebase_source : 405afaf2e3e77a2fb4761440f837645cf5a8c18e
This commit is contained in:
Eric Rahm 2016-11-07 10:31:50 -08:00
parent 6dabfdba6b
commit c839abc03c
1 changed files with 21 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
dom/xslt/xslt/txExecutionState.cpp
View File

@ -227,33 +227,47 @@ txExecutionState::getVariable(int32_t aNamespace, nsIAtom* aLName,
rv = var->mExpr->evaluate(getEvalContext(), &aResult);
mLocalVariables = oldVars;
NS_ENSURE_SUCCESS(rv, rv);
if (NS_FAILED(rv)) {
popEvalContext();
return rv;
}
}
else {
nsAutoPtr<txRtfHandler> rtfHandler(new txRtfHandler);
NS_ENSURE_TRUE(rtfHandler, NS_ERROR_OUT_OF_MEMORY);
rv = pushResultHandler(rtfHandler);
NS_ENSURE_SUCCESS(rv, rv);
if (NS_FAILED(rv)) {
popEvalContext();
return rv;
}
rtfHandler.forget();
txInstruction* prevInstr = mNextInstruction;
// set return to nullptr to stop execution
mNextInstruction = nullptr;
rv = runTemplate(var->mFirstInstruction);
NS_ENSURE_SUCCESS(rv, rv);
if (NS_FAILED(rv)) {
popEvalContext();
return rv;
}
pushTemplateRule(nullptr, txExpandedName(), nullptr);
rv = txXSLTProcessor::execute(*this);
NS_ENSURE_SUCCESS(rv, rv);
if (NS_FAILED(rv)) {
popEvalContext();
return rv;
}
popTemplateRule();
mNextInstruction = prevInstr;
rtfHandler = (txRtfHandler*)popResultHandler();
rv = rtfHandler->getAsRTF(&aResult);
NS_ENSURE_SUCCESS(rv, rv);
if (NS_FAILED(rv)) {
popEvalContext();
return rv;
}
}
popEvalContext();