<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[169218] branches/safari-537.77-branch/Source/WebCore</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/169218">169218</a></dd>
<dt>Author</dt> <dd>dburkart@apple.com</dd>
<dt>Date</dt> <dd>2014-05-22 14:16:03 -0700 (Thu, 22 May 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merged <a href="http://trac.webkit.org/projects/webkit/changeset/167264">r167264</a>. <rdar://problem/16975518></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#branchessafari53777branchSourceWebCoreChangeLog">branches/safari-537.77-branch/Source/WebCore/ChangeLog</a></li>
<li><a href="#branchessafari53777branchSourceWebCoreplatformgraphicsavfoundationobjcMediaPlayerPrivateAVFoundationObjCmm">branches/safari-537.77-branch/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm</a></li>
<li><a href="#branchessafari53777branchSourceWebCoreplatformgraphicsavfoundationobjcWebCoreAVFResourceLoaderh">branches/safari-537.77-branch/Source/WebCore/platform/graphics/avfoundation/objc/WebCoreAVFResourceLoader.h</a></li>
<li><a href="#branchessafari53777branchSourceWebCoreplatformgraphicsavfoundationobjcWebCoreAVFResourceLoadermm">branches/safari-537.77-branch/Source/WebCore/platform/graphics/avfoundation/objc/WebCoreAVFResourceLoader.mm</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="branchessafari53777branchSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-537.77-branch/Source/WebCore/ChangeLog (169217 => 169218)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-537.77-branch/Source/WebCore/ChangeLog 2014-05-22 21:11:55 UTC (rev 169217)
+++ branches/safari-537.77-branch/Source/WebCore/ChangeLog 2014-05-22 21:16:03 UTC (rev 169218)
</span><span class="lines">@@ -1,5 +1,26 @@
</span><span class="cx"> 2014-05-22 Dana Burkart <dburkart@apple.com>
</span><span class="cx">
</span><ins>+ Merge r167264
+
+ 2014-04-14 Jer Noble <jer.noble@apple.com>
+
+ Use after free in WebCore::CachedResourceHandleBase::~CachedResourceHandleBase / WebCore::removeDetachedChildrenInContainer
+ https://bugs.webkit.org/show_bug.cgi?id=131169
+
+ Reviewed by Eric Carlson.
+
+ Invalidate the WebCoreAVFResourceLoader owned by MediaPlayerPrivateAVFoundationObjC
+ in its destructor, to prevent a private function being called in response to the
+ WebCoreAVFResourceLoader being stopped.
+
+ * platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm:
+ (WebCore::MediaPlayerPrivateAVFoundationObjC::~MediaPlayerPrivateAVFoundationObjC):
+ * platform/graphics/avfoundation/objc/WebCoreAVFResourceLoader.h:
+ * platform/graphics/avfoundation/objc/WebCoreAVFResourceLoader.mm:
+ (WebCore::WebCoreAVFResourceLoader::invalidate):
+
+2014-05-22 Dana Burkart <dburkart@apple.com>
+
</ins><span class="cx"> Merge r166628
</span><span class="cx">
</span><span class="cx"> 2014-04-13 Darin Adler <darin@apple.com>
</span></span></pre></div>
<a id="branchessafari53777branchSourceWebCoreplatformgraphicsavfoundationobjcMediaPlayerPrivateAVFoundationObjCmm"></a>
<div class="modfile"><h4>Modified: branches/safari-537.77-branch/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm (169217 => 169218)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-537.77-branch/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm 2014-05-22 21:11:55 UTC (rev 169217)
+++ branches/safari-537.77-branch/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm 2014-05-22 21:16:03 UTC (rev 169218)
</span><span class="lines">@@ -253,6 +253,9 @@
</span><span class="cx"> #if __MAC_OS_X_VERSION_MIN_REQUIRED >= 1090
</span><span class="cx"> [m_loaderDelegate.get() setCallback:0];
</span><span class="cx"> [[m_avAsset.get() resourceLoader] setDelegate:nil queue:0];
</span><ins>+
+ for (auto& pair : m_resourceLoaderMap)
+ pair.value->invalidate();
</ins><span class="cx"> #endif
</span><span class="cx"> cancelLoad();
</span><span class="cx"> }
</span></span></pre></div>
<a id="branchessafari53777branchSourceWebCoreplatformgraphicsavfoundationobjcWebCoreAVFResourceLoaderh"></a>
<div class="modfile"><h4>Modified: branches/safari-537.77-branch/Source/WebCore/platform/graphics/avfoundation/objc/WebCoreAVFResourceLoader.h (169217 => 169218)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-537.77-branch/Source/WebCore/platform/graphics/avfoundation/objc/WebCoreAVFResourceLoader.h 2014-05-22 21:11:55 UTC (rev 169217)
+++ branches/safari-537.77-branch/Source/WebCore/platform/graphics/avfoundation/objc/WebCoreAVFResourceLoader.h 2014-05-22 21:16:03 UTC (rev 169218)
</span><span class="lines">@@ -51,6 +51,7 @@
</span><span class="cx">
</span><span class="cx"> void startLoading();
</span><span class="cx"> void stopLoading();
</span><ins>+ void invalidate();
</ins><span class="cx">
</span><span class="cx"> CachedRawResource* resource();
</span><span class="cx">
</span></span></pre></div>
<a id="branchessafari53777branchSourceWebCoreplatformgraphicsavfoundationobjcWebCoreAVFResourceLoadermm"></a>
<div class="modfile"><h4>Modified: branches/safari-537.77-branch/Source/WebCore/platform/graphics/avfoundation/objc/WebCoreAVFResourceLoader.mm (169217 => 169218)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-537.77-branch/Source/WebCore/platform/graphics/avfoundation/objc/WebCoreAVFResourceLoader.mm 2014-05-22 21:11:55 UTC (rev 169217)
+++ branches/safari-537.77-branch/Source/WebCore/platform/graphics/avfoundation/objc/WebCoreAVFResourceLoader.mm 2014-05-22 21:16:03 UTC (rev 169218)
</span><span class="lines">@@ -63,7 +63,7 @@
</span><span class="cx">
</span><span class="cx"> void WebCoreAVFResourceLoader::startLoading()
</span><span class="cx"> {
</span><del>- if (m_resource)
</del><ins>+ if (m_resource || !m_parent)
</ins><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> KURL requestURL = [[m_avRequest.get() request] URL];
</span><span class="lines">@@ -89,9 +89,16 @@
</span><span class="cx"> m_resource->removeClient(this);
</span><span class="cx"> m_resource = 0;
</span><span class="cx">
</span><del>- m_parent->didStopLoadingRequest(m_avRequest.get());
</del><ins>+ if (m_parent)
+ m_parent->didStopLoadingRequest(m_avRequest.get());
</ins><span class="cx"> }
</span><span class="cx">
</span><ins>+void WebCoreAVFResourceLoader::invalidate()
+{
+ m_parent = nullptr;
+ stopLoading();
+}
+
</ins><span class="cx"> void WebCoreAVFResourceLoader::responseReceived(CachedResource* resource, const ResourceResponse& response)
</span><span class="cx"> {
</span><span class="cx"> ASSERT(resource == m_resource);
</span></span></pre>
</div>
</div>
</body>
</html>