Merge 92298 - Crash in DocumentWriter::endIfNotLoadingMainResource

Source/WebCore/loader/DocumentWriter.cpp

 /*
  * Copyright (C) 2010. Adam Barth. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  *
  * 1.  Redistributions of source code must retain the above copyright
  *     notice, this list of conditions and the following disclaimer. 
  * 2.  Redistributions in binary form must reproduce the above copyright
@@ skipping 193 matching lines @@
 }
 
 void DocumentWriter::end()
 {
     m_frame->loader()->didEndDocument();
     endIfNotLoadingMainResource();
 }
 
 void DocumentWriter::endIfNotLoadingMainResource()
 {
+    // FIXME: This isn't really the check we should be doing. We should re-work
+    // how we end parsing to match the model in HTML5.
     if (m_frame->loader()->isLoadingMainResource() || !m_frame->page() || !m_frame->document())
         return;
 
     // http://bugs.webkit.org/show_bug.cgi?id=10854
     // The frame's last ref may be removed and it can be deleted by checkCompleted(), 
     // so we'll add a protective refcount
     RefPtr<Frame> protector(m_frame);
 
+    if (!m_parser)
+        return;
     // FIXME: m_parser->finish() should imply m_parser->flush().
     m_parser->flush(this);
     if (!m_parser)
         return;
     m_parser->finish();
     m_parser = 0;
 }
 
 String DocumentWriter::encoding() const
 {
@@ skipping 22 matching lines @@
     return m_frame->document()->url().isEmpty() ? m_encoding : encoding();
 }
 
 void DocumentWriter::setDocumentWasLoadedAsPartOfNavigation()
 {
     ASSERT(!m_parser->isStopped());
     m_parser->setDocumentWasLoadedAsPartOfNavigation();
 }
 
 } // namespace WebCore