Changeset 26041 in webkit

Timestamp:

Oct 4, 2007 1:45:12 AM (17 years ago)

Author:

lars

Message:

fix a crash in the FrameLoader that can happen under certain
conditions in the Qt port.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/fast/loader/iframe-crash-on-missing-image-expected.txt (added)
• LayoutTests/fast/loader/iframe-crash-on-missing-image.xhtml (added)
• WebCore/ChangeLog (modified) (1 diff)
• WebCore/loader/FrameLoader.cpp (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2007-10-04  Lars Knoll  <lars@trolltech.com>
+
+        Reviewed by maciej.
+
+        fix a crash in the FrameLoader that can happen under certain
+        conditions in the Qt port.
+
+        * fast/loader/iframe-crash-on-missing-image-expected.txt: Copied from LayoutTests/dom/xhtml/level2/html/HTMLIFrameElement01-expected.txt.
+        * fast/loader/iframe-crash-on-missing-image.xhtml: Copied from LayoutTests/dom/xhtml/level2/html/HTMLIFrameElement01.xhtml.
+
 2007-10-04  Lars Knoll  <lars@trolltech.com>
 

trunk/WebCore/ChangeLog

@@ +1 @@
+2007-10-04  Lars Knoll  <lars@trolltech.com>
+
+        Reviewed by maciej.
+
+        fix a crash in the FrameLoader that can happen under certain
+        conditions in the Qt port.
+
+        Test: fast/loader/iframe-crash-on-missing-image.xhtml
+
+        * loader/FrameLoader.cpp:
+        (WebCore::FrameLoader::receivedMainResourceError):
+
 2007-10-03  Alp Toker  <alp@atoker.com>
 

trunk/WebCore/loader/FrameLoader.cpp

@@ -3341 +3341 @@
     }
     
-    if (m_state == FrameStateProvisional) {
+    if (m_state == FrameStateProvisional && m_provisionalDocumentLoader) {
         KURL failedURL = m_provisionalDocumentLoader->originalRequestCopy().url();
         didNotOpenURL(failedURL);