<!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>[287751] branches/safari-612.4.9.3-branch</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/287751">287751</a></dd>
<dt>Author</dt> <dd>repstein@apple.com</dd>
<dt>Date</dt> <dd>2022-01-07 09:19:18 -0800 (Fri, 07 Jan 2022)</dd>
</dl>

<h3>Log Message</h3>
<pre>Cherry-pick <a href="http://trac.webkit.org/projects/webkit/changeset/287604">r287604</a>. rdar://problem/85966622

    Protect frame from destruction in HTMLMediaElement::setupAndCallJS
    https://bugs.webkit.org/show_bug.cgi?id=234259

    Patch by Frédéric Wang <fwang@igalia.com> on 2022-01-04
    Reviewed by Darin Adler.

    Source/WebCore:

    Test: http/tests/media/media-element-frame-destroyed-crash.html

    * html/HTMLMediaElement.cpp:
    (WebCore::HTMLMediaElement::setupAndCallJS): Protect the frame before executing the JS code,
    so that it is not destroyed before its associated ScriptController.

    LayoutTests:

    Add non-regression test, embedded in multiple iframes to make regression easily reproducible.

    * http/conf/mime.types: Ensure that ts files are served with MIME type video/mp2t as that's required
    to make the non-regression test work properly.
    * http/tests/media/media-element-frame-destroyed-crash-expected.txt: Added.
    * http/tests/media/media-element-frame-destroyed-crash.html: Added.
    * http/tests/media/resources/empty.ts: Added.
    * http/tests/media/resources/media-element-frame-destroyed-crash-subframe.html: Added.

    git-svn-id: https://svn.webkit.org/repository/webkit/trunk@287604 268f45cc-cd09-0410-ab3c-d52691b4dbfc</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#branchessafari612493branchLayoutTestsChangeLog">branches/safari-612.4.9.3-branch/LayoutTests/ChangeLog</a></li>
<li><a href="#branchessafari612493branchLayoutTestshttpconfmimetypes">branches/safari-612.4.9.3-branch/LayoutTests/http/conf/mime.types</a></li>
<li><a href="#branchessafari612493branchSourceWebCoreChangeLog">branches/safari-612.4.9.3-branch/Source/WebCore/ChangeLog</a></li>
<li><a href="#branchessafari612493branchSourceWebCorehtmlHTMLMediaElementcpp">branches/safari-612.4.9.3-branch/Source/WebCore/html/HTMLMediaElement.cpp</a></li>
</ul>

<h3>Added Paths</h3>
<ul>
<li><a href="#branchessafari612493branchLayoutTestshttptestsmediamediaelementframedestroyedcrashexpectedtxt">branches/safari-612.4.9.3-branch/LayoutTests/http/tests/media/media-element-frame-destroyed-crash-expected.txt</a></li>
<li><a href="#branchessafari612493branchLayoutTestshttptestsmediamediaelementframedestroyedcrashhtml">branches/safari-612.4.9.3-branch/LayoutTests/http/tests/media/media-element-frame-destroyed-crash.html</a></li>
<li><a href="#branchessafari612493branchLayoutTestshttptestsmediaresourcesemptyts">branches/safari-612.4.9.3-branch/LayoutTests/http/tests/media/resources/empty.ts</a></li>
<li><a href="#branchessafari612493branchLayoutTestshttptestsmediaresourcesmediaelementframedestroyedcrashsubframehtml">branches/safari-612.4.9.3-branch/LayoutTests/http/tests/media/resources/media-element-frame-destroyed-crash-subframe.html</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="branchessafari612493branchLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-612.4.9.3-branch/LayoutTests/ChangeLog (287750 => 287751)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-612.4.9.3-branch/LayoutTests/ChangeLog   2022-01-07 17:17:58 UTC (rev 287750)
+++ branches/safari-612.4.9.3-branch/LayoutTests/ChangeLog      2022-01-07 17:19:18 UTC (rev 287751)
</span><span class="lines">@@ -1,3 +1,50 @@
</span><ins>+2022-01-07  Russell Epstein  <repstein@apple.com>
+
+        Cherry-pick r287604. rdar://problem/85966622
+
+    Protect frame from destruction in HTMLMediaElement::setupAndCallJS
+    https://bugs.webkit.org/show_bug.cgi?id=234259
+    
+    Patch by Frédéric Wang <fwang@igalia.com> on 2022-01-04
+    Reviewed by Darin Adler.
+    
+    Source/WebCore:
+    
+    Test: http/tests/media/media-element-frame-destroyed-crash.html
+    
+    * html/HTMLMediaElement.cpp:
+    (WebCore::HTMLMediaElement::setupAndCallJS): Protect the frame before executing the JS code,
+    so that it is not destroyed before its associated ScriptController.
+    
+    LayoutTests:
+    
+    Add non-regression test, embedded in multiple iframes to make regression easily reproducible.
+    
+    * http/conf/mime.types: Ensure that ts files are served with MIME type video/mp2t as that's required
+    to make the non-regression test work properly.
+    * http/tests/media/media-element-frame-destroyed-crash-expected.txt: Added.
+    * http/tests/media/media-element-frame-destroyed-crash.html: Added.
+    * http/tests/media/resources/empty.ts: Added.
+    * http/tests/media/resources/media-element-frame-destroyed-crash-subframe.html: Added.
+    
+    git-svn-id: https://svn.webkit.org/repository/webkit/trunk@287604 268f45cc-cd09-0410-ab3c-d52691b4dbfc
+
+    2022-01-04  Frédéric Wang  <fwang@igalia.com>
+
+            Protect frame from destruction in HTMLMediaElement::setupAndCallJS
+            https://bugs.webkit.org/show_bug.cgi?id=234259
+
+            Reviewed by Darin Adler.
+
+            Add non-regression test, embedded in multiple iframes to make regression easily reproducible.
+
+            * http/conf/mime.types: Ensure that ts files are served with MIME type video/mp2t as that's required
+            to make the non-regression test work properly.
+            * http/tests/media/media-element-frame-destroyed-crash-expected.txt: Added.
+            * http/tests/media/media-element-frame-destroyed-crash.html: Added.
+            * http/tests/media/resources/empty.ts: Added.
+            * http/tests/media/resources/media-element-frame-destroyed-crash-subframe.html: Added.
+
</ins><span class="cx"> 2022-01-06  Russell Epstein  <repstein@apple.com>
</span><span class="cx"> 
</span><span class="cx">         Apply patch. rdar://problem/87125345
</span></span></pre></div>
<a id="branchessafari612493branchLayoutTestshttpconfmimetypes"></a>
<div class="modfile"><h4>Modified: branches/safari-612.4.9.3-branch/LayoutTests/http/conf/mime.types (287750 => 287751)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-612.4.9.3-branch/LayoutTests/http/conf/mime.types        2022-01-07 17:17:58 UTC (rev 287750)
+++ branches/safari-612.4.9.3-branch/LayoutTests/http/conf/mime.types   2022-01-07 17:19:18 UTC (rev 287751)
</span><span class="lines">@@ -578,7 +578,7 @@
</span><span class="cx"> video/jpeg
</span><span class="cx"> video/mp1s
</span><span class="cx"> video/mp2p
</span><del>-video/mp2t
</del><ins>+video/mp2t                      ts
</ins><span class="cx"> video/mp4                 mp4
</span><span class="cx"> video/mp4v-es
</span><span class="cx"> video/mpv
</span></span></pre></div>
<a id="branchessafari612493branchLayoutTestshttptestsmediamediaelementframedestroyedcrashexpectedtxt"></a>
<div class="addfile"><h4>Added: branches/safari-612.4.9.3-branch/LayoutTests/http/tests/media/media-element-frame-destroyed-crash-expected.txt (0 => 287751)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-612.4.9.3-branch/LayoutTests/http/tests/media/media-element-frame-destroyed-crash-expected.txt                           (rev 0)
+++ branches/safari-612.4.9.3-branch/LayoutTests/http/tests/media/media-element-frame-destroyed-crash-expected.txt      2022-01-07 17:19:18 UTC (rev 287751)
</span><span class="lines">@@ -0,0 +1,3 @@
</span><ins>+This test PASS if it does not CRASH.
+
+
</ins></span></pre></div>
<a id="branchessafari612493branchLayoutTestshttptestsmediamediaelementframedestroyedcrashhtml"></a>
<div class="addfile"><h4>Added: branches/safari-612.4.9.3-branch/LayoutTests/http/tests/media/media-element-frame-destroyed-crash.html (0 => 287751)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-612.4.9.3-branch/LayoutTests/http/tests/media/media-element-frame-destroyed-crash.html                           (rev 0)
+++ branches/safari-612.4.9.3-branch/LayoutTests/http/tests/media/media-element-frame-destroyed-crash.html      2022-01-07 17:19:18 UTC (rev 287751)
</span><span class="lines">@@ -0,0 +1,12 @@
</span><ins>+<script>
+  onload = () => {
+    if (window.testRunner)
+      testRunner.dumpAsText();
+    for (let i = 5; i; i--) {
+      let iframe = document.createElement('iframe');
+      iframe.src = 'resources/media-element-frame-destroyed-crash-subframe.html';
+      document.body.appendChild(iframe);
+    }
+  }
+</script>
+<p>This test PASS if it does not CRASH.</p>
</ins></span></pre></div>
<a id="branchessafari612493branchLayoutTestshttptestsmediaresourcesemptyts"></a>
<div class="addfile"><h4>Added: branches/safari-612.4.9.3-branch/LayoutTests/http/tests/media/resources/empty.ts ( => )</h4>
<pre class="diff"><span>
<span class="info">Added: branches/safari-612.4.9.3-branch/LayoutTests/http/tests/media/resources/media-element-frame-destroyed-crash-subframe.html
===================================================================
</span><del>--- branches/safari-612.4.9.3-branch/LayoutTests/http/tests/media/resources/media-element-frame-destroyed-crash-subframe.html                           (rev 0)
</del><ins>+++ branches/safari-612.4.9.3-branch/LayoutTests/http/tests/media/resources/media-element-frame-destroyed-crash-subframe.html    2022-01-07 17:19:18 UTC (rev 287751)
</ins><span class="lines">@@ -0,0 +1,17 @@
</span><ins>+<script>
+  onload = async () => {
+    if (window.testRunner)
+      testRunner.dumpAsText();
+    let embed0 = document.createElement('embed');
+    embed0.src = 'empty.ts';
+    document.body.appendChild(embed0);
+    await new Blob().text();
+    try {
+      await new FontFace('a', 'url(data:)').load();
+    } catch {}
+    document.designMode = 'on';
+    document.execCommand('SelectAll');
+    document.execCommand('Bold');
+    parent.postMessage('done');
+  };
+</script>
</ins></span></pre></div>
<a id="branchessafari612493branchSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-612.4.9.3-branch/Source/WebCore/ChangeLog (287750 => 287751)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-612.4.9.3-branch/Source/WebCore/ChangeLog        2022-01-07 17:17:58 UTC (rev 287750)
+++ branches/safari-612.4.9.3-branch/Source/WebCore/ChangeLog   2022-01-07 17:19:18 UTC (rev 287751)
</span><span class="lines">@@ -1,3 +1,47 @@
</span><ins>+2022-01-07  Russell Epstein  <repstein@apple.com>
+
+        Cherry-pick r287604. rdar://problem/85966622
+
+    Protect frame from destruction in HTMLMediaElement::setupAndCallJS
+    https://bugs.webkit.org/show_bug.cgi?id=234259
+    
+    Patch by Frédéric Wang <fwang@igalia.com> on 2022-01-04
+    Reviewed by Darin Adler.
+    
+    Source/WebCore:
+    
+    Test: http/tests/media/media-element-frame-destroyed-crash.html
+    
+    * html/HTMLMediaElement.cpp:
+    (WebCore::HTMLMediaElement::setupAndCallJS): Protect the frame before executing the JS code,
+    so that it is not destroyed before its associated ScriptController.
+    
+    LayoutTests:
+    
+    Add non-regression test, embedded in multiple iframes to make regression easily reproducible.
+    
+    * http/conf/mime.types: Ensure that ts files are served with MIME type video/mp2t as that's required
+    to make the non-regression test work properly.
+    * http/tests/media/media-element-frame-destroyed-crash-expected.txt: Added.
+    * http/tests/media/media-element-frame-destroyed-crash.html: Added.
+    * http/tests/media/resources/empty.ts: Added.
+    * http/tests/media/resources/media-element-frame-destroyed-crash-subframe.html: Added.
+    
+    git-svn-id: https://svn.webkit.org/repository/webkit/trunk@287604 268f45cc-cd09-0410-ab3c-d52691b4dbfc
+
+    2022-01-04  Frédéric Wang  <fwang@igalia.com>
+
+            Protect frame from destruction in HTMLMediaElement::setupAndCallJS
+            https://bugs.webkit.org/show_bug.cgi?id=234259
+
+            Reviewed by Darin Adler.
+
+            Test: http/tests/media/media-element-frame-destroyed-crash.html
+
+            * html/HTMLMediaElement.cpp:
+            (WebCore::HTMLMediaElement::setupAndCallJS): Protect the frame before executing the JS code,
+            so that it is not destroyed before its associated ScriptController.
+
</ins><span class="cx"> 2022-01-06  Russell Epstein  <repstein@apple.com>
</span><span class="cx"> 
</span><span class="cx">         Apply patch. rdar://problem/87125345
</span></span></pre></div>
<a id="branchessafari612493branchSourceWebCorehtmlHTMLMediaElementcpp"></a>
<div class="modfile"><h4>Modified: branches/safari-612.4.9.3-branch/Source/WebCore/html/HTMLMediaElement.cpp (287750 => 287751)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-612.4.9.3-branch/Source/WebCore/html/HTMLMediaElement.cpp        2022-01-07 17:17:58 UTC (rev 287750)
+++ branches/safari-612.4.9.3-branch/Source/WebCore/html/HTMLMediaElement.cpp   2022-01-07 17:19:18 UTC (rev 287751)
</span><span class="lines">@@ -4397,7 +4397,8 @@
</span><span class="cx"> 
</span><span class="cx">     auto pendingActivity = makePendingActivity(*this);
</span><span class="cx">     auto& world = ensureIsolatedWorld();
</span><del>-    auto& scriptController = document().frame()->script();
</del><ins>+    Ref protectedFrame = *document().frame();
+    auto& scriptController = protectedFrame->script();
</ins><span class="cx">     auto* globalObject = JSC::jsCast<JSDOMGlobalObject*>(scriptController.globalObject(world));
</span><span class="cx">     auto& vm = globalObject->vm();
</span><span class="cx">     JSC::JSLockHolder lock(vm);
</span></span></pre>
</div>
</div>

</body>
</html>