Changeset 94078 in webkit

Timestamp:

Aug 30, 2011, 8:28:03 AM (15 years ago)

Author:

vsevik@chromium.org

Message:

Web Inspector: Inspected page sometimes crashes in InspectorResourceAgent::didFailLoading
​https://bugs.webkit.org/show_bug.cgi?id=67193

Reviewed by Pavel Feldman.

• inspector/InspectorResourceAgent.cpp:

(WebCore::InspectorResourceAgent::didFailLoading):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• inspector/InspectorResourceAgent.cpp (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2011-08-30  Vsevolod Vlasov  <vsevik@chromium.org>
+
+        Web Inspector: Inspected page sometimes crashes in InspectorResourceAgent::didFailLoading
+        https://bugs.webkit.org/show_bug.cgi?id=67193
+
+        Reviewed by Pavel Feldman.
+
+        * inspector/InspectorResourceAgent.cpp:
+        (WebCore::InspectorResourceAgent::didFailLoading):
+
 2011-08-30  Ademar de Souza Reis Jr.  <ademar.reis@openbossa.org>
 

trunk/Source/WebCore/inspector/InspectorResourceAgent.cpp

@@ -293 +293 @@
 {
     String requestId = IdentifiersFactory::requestId(identifier);
-    if (m_resourcesData->resourceType(requestId) == InspectorPageAgent::DocumentResource)
-        m_resourcesData->addResourceSharedBuffer(requestId, loader->frameLoader()->documentLoader()->mainResourceData(), loader->frame()->document()->inputEncoding());
+
+    if (m_resourcesData->resourceType(requestId) == InspectorPageAgent::DocumentResource) {
+        Frame* frame = loader ? loader->frame() : 0;
+        if (frame && frame->loader()->documentLoader() && frame->document())
+            m_resourcesData->addResourceSharedBuffer(requestId, frame->loader()->documentLoader()->mainResourceData(), frame->document()->inputEncoding());
+    }
 
     m_frontend->loadingFailed(requestId, currentTime(), error.localizedDescription(), error.isCancellation());