From d190c0e8a2f33c2fa44cc3d8e5d798166c9261a2 Mon Sep 17 00:00:00 2001 From: "mrbkap%gmail.com" Date: Tue, 22 Sep 2009 22:55:56 +0000 Subject: [PATCH] Bug 497013 - Fix some re-entrancy bugs in the parser. r+sr=sicking a=dveditz git-svn-id: svn://10.0.0.236/trunk@258473 18797224-902f-48f8-a5cc-f745e15eee43 --- mozilla/parser/htmlparser/src/CNavDTD.cpp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/mozilla/parser/htmlparser/src/CNavDTD.cpp b/mozilla/parser/htmlparser/src/CNavDTD.cpp index dfae729fe11..f68afe30633 100644 --- a/mozilla/parser/htmlparser/src/CNavDTD.cpp +++ b/mozilla/parser/htmlparser/src/CNavDTD.cpp @@ -3092,9 +3092,9 @@ CNavDTD::AddHeadContent(nsIParserNode *aNode) // Make sure the head is opened. if (!(mFlags & NS_DTD_FLAG_HAS_OPEN_HEAD)) { - mFlags |= NS_DTD_FLAG_HAS_OPEN_HEAD; - mBodyContext->PushTag(eHTMLTag_head); result = mSink->OpenHead(); + mBodyContext->PushTag(eHTMLTag_head); + mFlags |= NS_DTD_FLAG_HAS_OPEN_HEAD; } // Note: userdefined tags in the head are treated as leaves. @@ -3113,11 +3113,11 @@ CNavDTD::AddHeadContent(nsIParserNode *aNode) mHeadContainerPosition = mBodyContext->GetCount(); } - mBodyContext->Push(static_cast(aNode), nsnull, - PR_FALSE); - // Note: The head context is already opened. result = mSink->OpenContainer(*aNode); + + mBodyContext->Push(static_cast(aNode), nsnull, + PR_FALSE); } MOZ_TIMER_DEBUGLOG(("Start: Parse Time: CNavDTD::AddHeadContent(), this=%p\n", this));