Bug 892582 - crash in nsContentSink::WillParseImpl , r=bz
authorOlli Pettay <Olli.Pettay@helsinki.fi>
Thu, 11 Jul 2013 22:39:06 -0400
changeset 150493 b44898282f21828d312b1be36f8f229ef5593e73
parent 150492 9db9da2ecca070a2f12d4aa4f0c7d2a627b0abbd
child 150500 4dda210929fb56003dba4de87b19c6c5d5cb7d5a
push id2859
push userakeybl@mozilla.com
push dateMon, 16 Sep 2013 19:14:59 +0000
treeherdermozilla-beta@87d3c51cd2bf [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersbz
bugs892582
milestone25.0a1
first release with
nightly linux32
b44898282f21 / 25.0a1 / 20130712030203 / files
nightly linux64
b44898282f21 / 25.0a1 / 20130712030203 / files
nightly mac
b44898282f21 / 25.0a1 / 20130712030203 / files
nightly win32
b44898282f21 / 25.0a1 / 20130712030203 / files
nightly win64
b44898282f21 / 25.0a1 / 20130712030203 / files
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
releases
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 892582 - crash in nsContentSink::WillParseImpl , r=bz
content/base/src/nsContentSink.cpp
--- a/content/base/src/nsContentSink.cpp
+++ b/content/base/src/nsContentSink.cpp
@@ -1496,17 +1496,17 @@ bool
 nsContentSink::IsScriptExecutingImpl()
 {
   return !!mScriptLoader->GetCurrentScript();
 }
 
 nsresult
 nsContentSink::WillParseImpl(void)
 {
-  if (mRunsToCompletion) {
+  if (mRunsToCompletion || !mDocument) {
     return NS_OK;
   }
 
   nsIPresShell *shell = mDocument->GetShell();
   if (!shell) {
     return NS_OK;
   }