<!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>[190516] trunk</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/190516">190516</a></dd>
<dt>Author</dt> <dd>jer.noble@apple.com</dd>
<dt>Date</dt> <dd>2015-10-02 12:51:21 -0700 (Fri, 02 Oct 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>[MSE] Browser crashes when appending invalid data to MSE source buffer
https://bugs.webkit.org/show_bug.cgi?id=149689
Reviewed by Darin Adler.
Source/WebCore:
Test: media/media-source/media-source-stpp-crash.html
Bail out early (as specced) after disconnecting the SourceBuffer from its MediaSource.
* Modules/mediasource/SourceBuffer.cpp:
(WebCore::SourceBuffer::sourceBufferPrivateDidReceiveInitializationSegment):
LayoutTests:
* media/content/stpp.mp4: Added.
* media/media-source/media-source-stpp-crash-expected.txt: Added.
* media/media-source/media-source-stpp-crash.html: Added.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreModulesmediasourceSourceBuffercpp">trunk/Source/WebCore/Modules/mediasource/SourceBuffer.cpp</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsmediacontentstppmp4">trunk/LayoutTests/media/content/stpp.mp4</a></li>
<li><a href="#trunkLayoutTestsmediamediasourcemediasourcestppcrashexpectedtxt">trunk/LayoutTests/media/media-source/media-source-stpp-crash-expected.txt</a></li>
<li><a href="#trunkLayoutTestsmediamediasourcemediasourcestppcrashhtml">trunk/LayoutTests/media/media-source/media-source-stpp-crash.html</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (190515 => 190516)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2015-10-02 19:43:09 UTC (rev 190515)
+++ trunk/LayoutTests/ChangeLog 2015-10-02 19:51:21 UTC (rev 190516)
</span><span class="lines">@@ -1,3 +1,14 @@
</span><ins>+2015-10-02 Jer Noble <jer.noble@apple.com>
+
+ [MSE] Browser crashes when appending invalid data to MSE source buffer
+ https://bugs.webkit.org/show_bug.cgi?id=149689
+
+ Reviewed by Darin Adler.
+
+ * media/content/stpp.mp4: Added.
+ * media/media-source/media-source-stpp-crash-expected.txt: Added.
+ * media/media-source/media-source-stpp-crash.html: Added.
+
</ins><span class="cx"> 2015-10-02 Alex Christensen <achristensen@webkit.org>
</span><span class="cx">
</span><span class="cx"> Reloading without content blockers doesn’t apply to resource loads after the main frame finishes
</span></span></pre></div>
<a id="trunkLayoutTestsmediacontentstppmp4"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/media/content/stpp.mp4 (0 => 190516)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/media/content/stpp.mp4 (rev 0)
+++ trunk/LayoutTests/media/content/stpp.mp4 2015-10-02 19:51:21 UTC (rev 190516)
</span><span class="lines">@@ -0,0 +1 @@
</span><ins>+ ftypiso6avc1isomdash\xA3moovlmvhd\xD1\xE0\xE4w\xD1\xE0\xE4w\xC8@(mvex trextrak\tkhd\xD1\xE0\xE4w\xD1\xE0\xE4w@\x808\xA3mdia mdhd\xD1\xE0\xE4w\xD1\xE0\xE4w\xC8\xC7-hdlrsubtBBC EBU-TT-DNminf sthd$dinf dref url stbl\xCAstsd\xBAstpphttp://www.w3.org/ns/ttml http://www.w3.org/ns/ttml#parameter http://www.w3.org/ns/ttml#styling http://www.w3.org/ns/ttml#metadata urn:ebu:tt:metadata urn:ebu:tt:stylesttsstscstszstco
</ins><span class="cx">\ No newline at end of file
</span></span></pre></div>
<a id="trunkLayoutTestsmediamediasourcemediasourcestppcrashexpectedtxt"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/media/media-source/media-source-stpp-crash-expected.txt (0 => 190516)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/media/media-source/media-source-stpp-crash-expected.txt (rev 0)
+++ trunk/LayoutTests/media/media-source/media-source-stpp-crash-expected.txt 2015-10-02 19:51:21 UTC (rev 190516)
</span><span class="lines">@@ -0,0 +1,12 @@
</span><ins>+
+Tests that an unsupported media file (e.g., containing sttp track) does not cause a crash in appendBuffer().
+RUN(video.src = URL.createObjectURL(source))
+EVENT(sourceopen)
+RUN(sourceBuffer = source.addSourceBuffer("video/mp4"))
+RUN(sourceBuffer.appendBuffer(initSegment))
+EXPECTED (sourceBuffer.updating == 'true') OK
+EVENT(updatestart)
+EVENT(updateend)
+EXPECTED (sourceBuffer.updating == 'false') OK
+END OF TEST
+
</ins></span></pre></div>
<a id="trunkLayoutTestsmediamediasourcemediasourcestppcrashhtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/media/media-source/media-source-stpp-crash.html (0 => 190516)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/media/media-source/media-source-stpp-crash.html (rev 0)
+++ trunk/LayoutTests/media/media-source/media-source-stpp-crash.html 2015-10-02 19:51:21 UTC (rev 190516)
</span><span class="lines">@@ -0,0 +1,48 @@
</span><ins>+<!DOCTYPE html>
+<html>
+<head>
+ <title>mock-media-source</title>
+ <script src="mock-media-source.js"></script>
+ <script src="../video-test.js"></script>
+ <script>
+ var source;
+ var sourceBuffer;
+ var initSegment;
+
+ function runTest() {
+ consoleWrite('Tests that an unsupported media file (e.g., containing sttp track) does not cause a crash in appendBuffer().');
+ findMediaElement();
+
+ source = new MediaSource();
+ waitForEventOn(source, 'sourceopen', sourceOpen);
+ run('video.src = URL.createObjectURL(source)');
+ }
+
+ function sourceOpen() {
+ run('sourceBuffer = source.addSourceBuffer("video/mp4")');
+
+ waitForEventOn(sourceBuffer, 'updatestart');
+ waitForEventOn(sourceBuffer, 'update');
+ waitForEventOn(sourceBuffer, 'updateend', updateEnd);
+
+ var request = new XMLHttpRequest();
+ request.responseType = 'arraybuffer';
+ request.open('GET', '../content/stpp.mp4', false);
+ request.send();
+
+ initSegment = request.response;
+ run('sourceBuffer.appendBuffer(initSegment)');
+ testExpected('sourceBuffer.updating', true);
+ }
+
+ function updateEnd() {
+ testExpected('sourceBuffer.updating', false);
+ endTest();
+ }
+
+ </script>
+</head>
+<body onload="runTest()">
+ <video></video>
+</body>
+</html>
</ins></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (190515 => 190516)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2015-10-02 19:43:09 UTC (rev 190515)
+++ trunk/Source/WebCore/ChangeLog 2015-10-02 19:51:21 UTC (rev 190516)
</span><span class="lines">@@ -1,3 +1,17 @@
</span><ins>+2015-10-02 Jer Noble <jer.noble@apple.com>
+
+ [MSE] Browser crashes when appending invalid data to MSE source buffer
+ https://bugs.webkit.org/show_bug.cgi?id=149689
+
+ Reviewed by Darin Adler.
+
+ Test: media/media-source/media-source-stpp-crash.html
+
+ Bail out early (as specced) after disconnecting the SourceBuffer from its MediaSource.
+
+ * Modules/mediasource/SourceBuffer.cpp:
+ (WebCore::SourceBuffer::sourceBufferPrivateDidReceiveInitializationSegment):
+
</ins><span class="cx"> 2015-10-02 Simon Fraser <simon.fraser@apple.com>
</span><span class="cx">
</span><span class="cx"> ASSERTION FAILED: param >= 0 in AnimationBase::updateStateMachine()
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesmediasourceSourceBuffercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/mediasource/SourceBuffer.cpp (190515 => 190516)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/mediasource/SourceBuffer.cpp 2015-10-02 19:43:09 UTC (rev 190515)
+++ trunk/Source/WebCore/Modules/mediasource/SourceBuffer.cpp 2015-10-02 19:51:21 UTC (rev 190516)
</span><span class="lines">@@ -1022,8 +1022,10 @@
</span><span class="cx">
</span><span class="cx"> // 2. If the initialization segment has no audio, video, or text tracks, then run the append error algorithm
</span><span class="cx"> // with the decode error parameter set to true and abort these steps.
</span><del>- if (!segment.audioTracks.size() && !segment.videoTracks.size() && !segment.textTracks.size())
</del><ins>+ if (segment.audioTracks.isEmpty() && segment.videoTracks.isEmpty() && segment.textTracks.isEmpty()) {
</ins><span class="cx"> appendError(true);
</span><ins>+ return;
+ }
</ins><span class="cx">
</span><span class="cx"> // 3. If the first initialization segment flag is true, then run the following steps:
</span><span class="cx"> if (m_receivedFirstInitializationSegment) {
</span></span></pre>
</div>
</div>
</body>
</html>