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

Fix crasher in key()'s when context-node is a document.

Browse Source 
b=120074 r=Pike,peterv sr=jst
This commit is contained in:
sicking%bigfoot.com 2002-01-15 22:20:30 +00:00
parent b9171e8d88
commit 01b7208527
1 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
extensions/transformiix/source/xslt/functions/txKeyFunctionCall.cpp
View File

@ -72,18 +72,24 @@ ExprResult* txKeyFunctionCall::evaluate(Node* aContext, ContextState* aCs)
if (!exprResult)
return res;
Document* contextDoc;
if (aContext->getNodeType() == Node::DOCUMENT_NODE)
contextDoc = (Document*)aContext;
else
contextDoc = aContext->getOwnerDocument();
if (exprResult->getResultType() == ExprResult::NODESET) {
NodeSet* nodeSet = (NodeSet*) exprResult;
for (int i=0; i<nodeSet->size(); i++) {
String val;
XMLDOMUtils::getNodeValue(nodeSet->get(i), &val);
key->getNodes(val,aContext->getOwnerDocument())->copyInto(*res);
key->getNodes(val,contextDoc)->copyInto(*res);
}
}
else {
String val;
exprResult->stringValue(val);
key->getNodes(val,aContext->getOwnerDocument())->copyInto(*res);
key->getNodes(val,contextDoc)->copyInto(*res);
}
delete exprResult;
return res;
@ -124,6 +130,10 @@ txXSLKey::~txXSLKey()
*/
const NodeSet* txXSLKey::getNodes(String& aKeyValue, Document* aDoc)
{
NS_ASSERTION(aDoc, "missing document");
if (!aDoc)
return &mEmptyNodeset;
NamedMap* map = (NamedMap*)mMaps.get(aDoc);
if (!map) {
map = addDocument(aDoc);