Changeset 96249 in webkit

Timestamp:

Sep 28, 2011, 12:55:44 PM (14 years ago)

Author:

Csaba Osztrogonác

Message:

Fix a regression in r96060. ResourceLoader shouldn't get
initialized with a null DocumentLoader.
​https://bugs.webkit.org/show_bug.cgi?id=69004

Patch by Nate Chapin <Nate Chapin> on 2011-09-28
Reviewed by Csaba Osztrogonác.

This should fix a debug crash in some platforms in
plugins/js-from-destroy.html

• loader/ResourceLoader.cpp:

(WebCore::ResourceLoader::init): Move the activeDocumentLoader() null checks back

to SubresouceLoader::create().

• loader/SubresourceLoader.cpp:

(WebCore::SubresourceLoader::create):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• loader/ResourceLoader.cpp (modified) (1 diff)
• loader/SubresourceLoader.cpp (modified) (3 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2011-09-28  Nate Chapin  <japhet@chromium.org>
+
+        Fix a regression in r96060. ResourceLoader shouldn't get
+        initialized with a null DocumentLoader.
+        https://bugs.webkit.org/show_bug.cgi?id=69004
+
+        Reviewed by Csaba Osztrogonác.
+
+        This should fix a debug crash in some platforms in
+        plugins/js-from-destroy.html
+
+        * loader/ResourceLoader.cpp:
+        (WebCore::ResourceLoader::init): Move the activeDocumentLoader() null checks back
+            to SubresouceLoader::create().
+        * loader/SubresourceLoader.cpp:
+        (WebCore::SubresourceLoader::create):
+
 2011-09-28  Adam Barth  <abarth@webkit.org>
 

trunk/Source/WebCore/loader/ResourceLoader.cpp

@@ -114 +114 @@
     ResourceRequest clientRequest(r);
     
-    FrameLoader* frameLoader = m_frame->loader();
-    if (m_options.securityCheck == DoSecurityCheck && (frameLoader->state() == FrameStateProvisional || !frameLoader->activeDocumentLoader() || frameLoader->activeDocumentLoader()->isStopping())) {
-        releaseResources();
-        return false;
-    }
-    
     if (m_options.securityCheck == DoSecurityCheck && !m_frame->document()->securityOrigin()->canDisplay(clientRequest.url())) {
         FrameLoader::reportLocalLoadFailed(m_frame.get(), clientRequest.url().string());

trunk/Source/WebCore/loader/SubresourceLoader.cpp

@@ -67 +67 @@
         return 0;
 
-    FrameLoader* fl = frame->loader();
+    FrameLoader* frameLoader = frame->loader();
+    if (options.securityCheck == DoSecurityCheck && (frameLoader->state() == FrameStateProvisional || !frameLoader->activeDocumentLoader() || frameLoader->activeDocumentLoader()->isStopping()))
+        return 0;
+
     ResourceRequest newRequest = request;
 
@@ -77 +80 @@
     String outgoingOrigin;
     if (request.httpReferrer().isNull()) {
-        outgoingReferrer = fl->outgoingReferrer();
-        outgoingOrigin = fl->outgoingOrigin();
+        outgoingReferrer = frameLoader->outgoingReferrer();
+        outgoingOrigin = frameLoader->outgoingOrigin();
     } else {
         outgoingReferrer = request.httpReferrer();
@@ -90 +93 @@
     FrameLoader::addHTTPOriginIfNeeded(newRequest, outgoingOrigin);
 
-    fl->addExtraFieldsToSubresourceRequest(newRequest);
+    frameLoader->addExtraFieldsToSubresourceRequest(newRequest);
 
     RefPtr<SubresourceLoader> subloader(adoptRef(new SubresourceLoader(frame, client, options)));