зеркало из https://github.com/mozilla/gecko-dev.git
Bug 333668, fix uninitialized lastnode, r+sr=sicking
This commit is contained in:
Родитель
0f33a26960
Коммит
579741a30e
|
@ -254,7 +254,7 @@ nsXULTemplateQueryProcessorRDF::CompileQuery(nsIXULTemplateBuilder* aBuilder,
|
|||
query->mMemberVariable = aMemberVariable;
|
||||
|
||||
nsresult rv;
|
||||
TestNode *lastnode;
|
||||
TestNode *lastnode = nsnull;
|
||||
|
||||
nsCOMPtr<nsIContent> content = do_QueryInterface(aQueryNode);
|
||||
|
||||
|
@ -262,8 +262,12 @@ nsXULTemplateQueryProcessorRDF::CompileQuery(nsIXULTemplateBuilder* aBuilder,
|
|||
// simplified syntax with no rules
|
||||
|
||||
query->SetSimple();
|
||||
NS_ASSERTION(!mSimpleRuleMemberTest,
|
||||
"CompileQuery called twice with the same template");
|
||||
if (!mSimpleRuleMemberTest)
|
||||
rv = AddDefaultSimpleRules(query, &lastnode);
|
||||
else
|
||||
rv = NS_ERROR_FAILURE;
|
||||
}
|
||||
else if (content->NodeInfo()->Equals(nsXULAtoms::rule, kNameSpaceID_XUL)) {
|
||||
// simplified syntax with at least one rule
|
||||
|
|
Загрузка…
Ссылка в новой задаче