Changeset 201615 in webkit

Timestamp:

Jun 2, 2016, 1:37:22 PM (10 years ago)

Author:

Chris Dumez

Message:

Crash under CachedResource::addClientToSet()
​https://bugs.webkit.org/show_bug.cgi?id=158310
<rdar://problem/23643359>

Reviewed by Eric Carlson.

Only call CachedResource::addClient() on the resource returned
by CachedResourceLoader::requestMedia() if the resource is
non-null. CachedResourceLoader::requestMedia() can return null
in some cases so we need to handle this properly.

No new tests, no known reproduction case.

• platform/graphics/avfoundation/objc/WebCoreAVFResourceLoader.mm:

(WebCore::WebCoreAVFResourceLoader::startLoading):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• platform/graphics/avfoundation/objc/WebCoreAVFResourceLoader.mm (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2016-06-02  Chris Dumez  <cdumez@apple.com>
+
+        Crash under CachedResource::addClientToSet()
+        https://bugs.webkit.org/show_bug.cgi?id=158310
+        <rdar://problem/23643359>
+
+        Reviewed by Eric Carlson.
+
+        Only call CachedResource::addClient() on the resource returned
+        by CachedResourceLoader::requestMedia() if the resource is
+        non-null. CachedResourceLoader::requestMedia() can return null
+        in some cases so we need to handle this properly.
+
+        No new tests, no known reproduction case.
+
+        * platform/graphics/avfoundation/objc/WebCoreAVFResourceLoader.mm:
+        (WebCore::WebCoreAVFResourceLoader::startLoading):
+
 2016-06-02  Chris Dumez  <cdumez@apple.com>
 

trunk/Source/WebCore/platform/graphics/avfoundation/objc/WebCoreAVFResourceLoader.mm

@@ -71 +71 @@
     // is in a user-agent shadow tree. See <https://bugs.webkit.org/show_bug.cgi?id=155505>.
     CachedResourceRequest request(nsRequest, ResourceLoaderOptions(SendCallbacks, DoNotSniffContent, BufferData, DoNotAllowStoredCredentials, DoNotAskClientForCrossOriginCredentials, ClientDidNotRequestCredentials, DoSecurityCheck, UseDefaultOriginRestrictionsForType, DoNotIncludeCertificateInfo, ContentSecurityPolicyImposition::DoPolicyCheck, DefersLoadingPolicy::AllowDefersLoading, CachingPolicy::DisallowCaching));
+    request.mutableResourceRequest().setPriority(ResourceLoadPriority::Low);
+    if (auto* loader = m_parent->player()->cachedResourceLoader())
+        m_resource = loader->requestMedia(request);
 
-    request.mutableResourceRequest().setPriority(ResourceLoadPriority::Low);
-    if (CachedResourceLoader* loader = m_parent->player()->cachedResourceLoader()) {
-        m_resource = loader->requestMedia(request);
+    if (m_resource)
         m_resource->addClient(this);
-    } else {
-        m_resource = nullptr;
+    else {
         LOG_ERROR("Failed to start load for media at url %s", [[[nsRequest URL] absoluteString] UTF8String]);
         [m_avRequest.get() finishLoadingWithError:0];