From 75e69499cccad0baf945af28acb5bb54c9e28d00 Mon Sep 17 00:00:00 2001 From: Blake Kaplan Date: Tue, 4 Aug 2009 14:32:46 -0700 Subject: [PATCH] Bug 497013 - Fix some re-entrancy bugs in the parser. r+sr=sicking --- parser/htmlparser/src/CNavDTD.cpp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/parser/htmlparser/src/CNavDTD.cpp b/parser/htmlparser/src/CNavDTD.cpp index 2231f385a0b4..6366704fc509 100644 --- a/parser/htmlparser/src/CNavDTD.cpp +++ b/parser/htmlparser/src/CNavDTD.cpp @@ -3046,9 +3046,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. @@ -3067,11 +3067,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));