diff --git a/mozilla/content/html/document/src/nsHTMLContentSink.cpp b/mozilla/content/html/document/src/nsHTMLContentSink.cpp index 462063f3f43..54a5f3fd04f 100644 --- a/mozilla/content/html/document/src/nsHTMLContentSink.cpp +++ b/mozilla/content/html/document/src/nsHTMLContentSink.cpp @@ -1379,8 +1379,10 @@ HTMLContentSink::DidBuildModel(PRInt32 aQualityLevel) ("HTMLContentSink::DidBuildModel: layout final content")); // Reflow the last batch of content - mDocument->ContentAppended(mBody, mBodyChildCount); - mBody->ChildCount(mBodyChildCount); + if (nsnull != mBody) { + mDocument->ContentAppended(mBody, mBodyChildCount); + mBody->ChildCount(mBodyChildCount); + } ScrollToRef(); mDocument->EndLoad(); diff --git a/mozilla/layout/html/document/src/nsHTMLContentSink.cpp b/mozilla/layout/html/document/src/nsHTMLContentSink.cpp index 462063f3f43..54a5f3fd04f 100644 --- a/mozilla/layout/html/document/src/nsHTMLContentSink.cpp +++ b/mozilla/layout/html/document/src/nsHTMLContentSink.cpp @@ -1379,8 +1379,10 @@ HTMLContentSink::DidBuildModel(PRInt32 aQualityLevel) ("HTMLContentSink::DidBuildModel: layout final content")); // Reflow the last batch of content - mDocument->ContentAppended(mBody, mBodyChildCount); - mBody->ChildCount(mBodyChildCount); + if (nsnull != mBody) { + mDocument->ContentAppended(mBody, mBodyChildCount); + mBody->ChildCount(mBodyChildCount); + } ScrollToRef(); mDocument->EndLoad();