Title: [94078] trunk/Source/WebCore
- Revision
- 94078
- Author
- [email protected]
- Date
- 2011-08-30 08:28:03 -0700 (Tue, 30 Aug 2011)
Log 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):
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (94077 => 94078)
--- trunk/Source/WebCore/ChangeLog 2011-08-30 15:16:16 UTC (rev 94077)
+++ trunk/Source/WebCore/ChangeLog 2011-08-30 15:28:03 UTC (rev 94078)
@@ -1,3 +1,13 @@
+2011-08-30 Vsevolod Vlasov <[email protected]>
+
+ 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. <[email protected]>
[Qt] Do not unconditionally use pkg-config in .pro files
Modified: trunk/Source/WebCore/inspector/InspectorResourceAgent.cpp (94077 => 94078)
--- trunk/Source/WebCore/inspector/InspectorResourceAgent.cpp 2011-08-30 15:16:16 UTC (rev 94077)
+++ trunk/Source/WebCore/inspector/InspectorResourceAgent.cpp 2011-08-30 15:28:03 UTC (rev 94078)
@@ -292,9 +292,13 @@
void InspectorResourceAgent::didFailLoading(unsigned long identifier, DocumentLoader* loader, const ResourceError& error)
{
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());
}
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
