Changeset 62736 in webkit

Timestamp:

Jul 7, 2010 6:19:36 PM (14 years ago)

Author:

Darin Adler

Message:

2010-07-07 Darin Adler <Darin Adler>

Reviewed by Anders Carlsson.

Fix adoptRef assertion failures caused by stack-allocated ResourceHandle objects
​https://bugs.webkit.org/show_bug.cgi?id=41823

• platform/network/android/ResourceHandleAndroid.cpp: (WebCore::ResourceHandle::loadResourceSynchronously): Use adoptRef and new instead of allocating an object on the stack.
• platform/network/curl/ResourceHandleCurl.cpp: (WebCore::ResourceHandle::loadResourceSynchronously): Ditto.
• platform/network/qt/ResourceHandleQt.cpp: (WebCore::ResourceHandle::loadResourceSynchronously): Ditto.

• platform/network/soup/ResourceHandleSoup.cpp: (WebCore::ResourceHandle::loadResourceSynchronously): Use create instead of allocating an object on the stack.

Location:

trunk/WebCore

Files:

• ChangeLog (modified) (1 diff)
• platform/network/android/ResourceHandleAndroid.cpp (modified) (1 diff)
• platform/network/curl/ResourceHandleCurl.cpp (modified) (1 diff)
• platform/network/qt/ResourceHandleQt.cpp (modified) (2 diffs)
• platform/network/soup/ResourceHandleSoup.cpp (modified) (2 diffs)

trunk/WebCore/ChangeLog

@@ +1 @@
+2010-07-07  Darin Adler  <darin@apple.com>
+
+        Reviewed by Anders Carlsson.
+
+        Fix adoptRef assertion failures caused by stack-allocated ResourceHandle objects
+        https://bugs.webkit.org/show_bug.cgi?id=41823
+
+        * platform/network/android/ResourceHandleAndroid.cpp:
+        (WebCore::ResourceHandle::loadResourceSynchronously): Use adoptRef and new instead
+        of allocating an object on the stack.
+        * platform/network/curl/ResourceHandleCurl.cpp:
+        (WebCore::ResourceHandle::loadResourceSynchronously): Ditto.
+        * platform/network/qt/ResourceHandleQt.cpp:
+        (WebCore::ResourceHandle::loadResourceSynchronously): Ditto.
+
+        * platform/network/soup/ResourceHandleSoup.cpp:
+        (WebCore::ResourceHandle::loadResourceSynchronously): Use create instead of
+        allocating an object on the stack.
+
 2010-07-07  Joseph Pecoraro  <joepeck@webkit.org>
 

trunk/WebCore/platform/network/android/ResourceHandleAndroid.cpp

@@ -147 +147 @@
 {
     SyncLoader s(error, response, data);
-    ResourceHandle h(request, &s, false, false, false);
+    RefPtr<ResourceHandle> h = adoptRef(new ResourceHandle(request, &s, false, false, false));
     // This blocks until the load is finished.
-    ResourceLoaderAndroid::start(&h, request, frame->loader()->client(), false, true);
+    ResourceLoaderAndroid::start(h.get(), request, frame->loader()->client(), false, true);
 }
 

trunk/WebCore/platform/network/curl/ResourceHandleCurl.cpp

@@ -191 +191 @@
 {
     WebCoreSynchronousLoader syncLoader;
-    ResourceHandle handle(request, &syncLoader, true, false);
+    RefPtr<ResourceHandle> handle = adoptRef(new ResourceHandle(request, &syncLoader, true, false));
 
     ResourceHandleManager* manager = ResourceHandleManager::sharedInstance();
 
-    manager->dispatchSynchronousJob(&handle);
+    manager->dispatchSynchronousJob(handle.get());
 
     error = syncLoader.resourceError();

trunk/WebCore/platform/network/qt/ResourceHandleQt.cpp

@@ -190 +190 @@
 {
     WebCoreSynchronousLoader syncLoader;
-    ResourceHandle handle(request, &syncLoader, true, false);
-
-    ResourceHandleInternal *d = handle.getInternal();
+    RefPtr<ResourceHandle> handle = adoptRef(new ResourceHandle(request, &syncLoader, true, false));
+
+    ResourceHandleInternal* d = handle->getInternal();
     if (!(d->m_user.isEmpty() || d->m_pass.isEmpty())) {
         // If credentials were specified for this request, add them to the url,
@@ -202 +202 @@
     }
     d->m_frame = static_cast<FrameLoaderClientQt*>(frame->loader()->client())->webFrame();
-    d->m_job = new QNetworkReplyHandler(&handle, QNetworkReplyHandler::LoadNormal);
+    d->m_job = new QNetworkReplyHandler(handle.get(), QNetworkReplyHandler::LoadNormal);
 
     syncLoader.waitForCompletion();

trunk/WebCore/platform/network/soup/ResourceHandleSoup.cpp

@@ -659 +659 @@
 {
     WebCoreSynchronousLoader syncLoader(error, response, data);
-    ResourceHandle handle(request, &syncLoader, true, false);
-
-    handle.start(frame);
+    RefPtr<ResourceHandle> handle = create(request, &syncLoader, frame, true, false);
     syncLoader.run();
 }
@@ -930 +928 @@
 
 }
-