Merge 94078 - Web Inspector: Inspected page sometimes crashes in InspectorResourceAgent::didFailL...

Source/WebCore/inspector/InspectorResourceAgent.cpp

 /*
  * Copyright (C) 2011 Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
  * met:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 282 matching lines @@
 
     if (!finishTime)
         finishTime = currentTime();
 
     m_frontend->loadingFinished(resourceId, finishTime);
 }
 
 void InspectorResourceAgent::didFailLoading(unsigned long identifier, DocumentLoader* loader, const ResourceError& error)
 {
     String resourceId = IdentifiersFactory::resourceId(identifier);
-    if (m_resourcesData->resourceType(resourceId) == InspectorPageAgent::DocumentResource)
-        m_resourcesData->addResourceSharedBuffer(resourceId, loader->frameLoader()->documentLoader()->mainResourceData(), loader->frame()->document()->inputEncoding());
+
+    if (m_resourcesData->resourceType(resourceId) == InspectorPageAgent::DocumentResource) {
+        Frame* frame = loader ? loader->frame() : 0;
+        if (frame && frame->loader()->documentLoader() && frame->document())
+            m_resourcesData->addResourceSharedBuffer(resourceId, frame->loader()->documentLoader()->mainResourceData(), frame->document()->inputEncoding());
+    }
 
     m_frontend->loadingFailed(resourceId, currentTime(), error.localizedDescription(), error.isCancellation());
 }
 
 void InspectorResourceAgent::didLoadResourceFromMemoryCache(DocumentLoader* loader, CachedResource* resource)
 {
     String loaderId = m_pageAgent->loaderId(loader);
     String frameId = m_pageAgent->frameId(loader->frame());
     unsigned long identifier = loader->frame()->page()->progress()->createUniqueIdentifier();
     String resourceId = IdentifiersFactory::resourceId(identifier);
@@ skipping 218 matching lines @@
         // Create mock frontend, so we can collect network events.
         m_frontend = m_mockFrontend.get();
         enable();
     } else
         m_frontend = 0;
 }
 
 } // namespace WebCore
 
 #endif // ENABLE(INSPECTOR)