<!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>[181174] 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/181174">181174</a></dd>
<dt>Author</dt> <dd>jer.noble@apple.com</dd>
<dt>Date</dt> <dd>2015-03-06 11:31:16 -0800 (Fri, 06 Mar 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>[Web Audio] Decoding specific .m4a file crashes tab
https://bugs.webkit.org/show_bug.cgi?id=139545
Reviewed by Eric Carlson.
Source/WebCore:
Test: webaudio/decode-audio-data-too-short.html
Bail out early if CoreAudio reports the number of frames in the file to be negative.
* platform/audio/mac/AudioFileReaderMac.cpp:
(WebCore::AudioFileReader::createBus):
LayoutTests:
* webaudio/decode-audio-data-too-short-expected.txt: Added.
* webaudio/decode-audio-data-too-short.html: Added.
* webaudio/resources/media/too-short.m4a: 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="#trunkSourceWebCoreplatformaudiomacAudioFileReaderMaccpp">trunk/Source/WebCore/platform/audio/mac/AudioFileReaderMac.cpp</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkLayoutTestswebaudiodecodeaudiodatatooshortexpectedtxt">trunk/LayoutTests/webaudio/decode-audio-data-too-short-expected.txt</a></li>
<li><a href="#trunkLayoutTestswebaudiodecodeaudiodatatooshorthtml">trunk/LayoutTests/webaudio/decode-audio-data-too-short.html</a></li>
<li><a href="#trunkLayoutTestswebaudioresourcesmediatooshortm4a">trunk/LayoutTests/webaudio/resources/media/too-short.m4a</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (181173 => 181174)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2015-03-06 19:28:26 UTC (rev 181173)
+++ trunk/LayoutTests/ChangeLog 2015-03-06 19:31:16 UTC (rev 181174)
</span><span class="lines">@@ -1,3 +1,14 @@
</span><ins>+2015-03-06 Jer Noble <jer.noble@apple.com>
+
+ [Web Audio] Decoding specific .m4a file crashes tab
+ https://bugs.webkit.org/show_bug.cgi?id=139545
+
+ Reviewed by Eric Carlson.
+
+ * webaudio/decode-audio-data-too-short-expected.txt: Added.
+ * webaudio/decode-audio-data-too-short.html: Added.
+ * webaudio/resources/media/too-short.m4a: Added.
+
</ins><span class="cx"> 2015-03-06 Myles C. Maxfield <mmaxfield@apple.com>
</span><span class="cx">
</span><span class="cx"> Crash in -[WebCascadeList objectAtIndex:] + 195
</span></span></pre></div>
<a id="trunkLayoutTestswebaudiodecodeaudiodatatooshortexpectedtxt"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/webaudio/decode-audio-data-too-short-expected.txt (0 => 181174)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/webaudio/decode-audio-data-too-short-expected.txt (rev 0)
+++ trunk/LayoutTests/webaudio/decode-audio-data-too-short-expected.txt 2015-03-06 19:31:16 UTC (rev 181174)
</span><span class="lines">@@ -0,0 +1,9 @@
</span><ins>+Test that decoding an audio file which is too short does not cause a crash.
+
+On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
+
+
+PASS successfullyParsed is true
+
+TEST COMPLETE
+
</ins></span></pre></div>
<a id="trunkLayoutTestswebaudiodecodeaudiodatatooshorthtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/webaudio/decode-audio-data-too-short.html (0 => 181174)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/webaudio/decode-audio-data-too-short.html (rev 0)
+++ trunk/LayoutTests/webaudio/decode-audio-data-too-short.html 2015-03-06 19:31:16 UTC (rev 181174)
</span><span class="lines">@@ -0,0 +1,31 @@
</span><ins>+<!DOCTYPE html>
+<html>
+<head>
+<script src="../resources/js-test-pre.js"></script>
+<script type="text/javascript" src="resources/audio-testing.js"></script>
+</head>
+<body>
+<script>
+description("Test that decoding an audio file which is too short does not cause a crash.");
+
+if (window.testRunner) {
+ testRunner.dumpAsText();
+ testRunner.waitUntilDone();
+}
+
+window.jsTestIsAsync = true;
+
+var context = new webkitAudioContext();
+var request = new XMLHttpRequest();
+request.open("GET", 'resources/media/too-short.m4a', true);
+request.responseType = "arraybuffer";
+
+request.onload = function() {
+ context.decodeAudioData(request.response, finishJSTest, finishJSTest);
+}
+request.send();
+
+</script>
+<script src="../resources/js-test-post.js"></script>
+</body>
+</html>
</ins></span></pre></div>
<a id="trunkLayoutTestswebaudioresourcesmediatooshortm4a"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/webaudio/resources/media/too-short.m4a (0 => 181174)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/webaudio/resources/media/too-short.m4a (rev 0)
+++ trunk/LayoutTests/webaudio/resources/media/too-short.m4a 2015-03-06 19:31:16 UTC (rev 181174)
</span><span class="lines">@@ -0,0 +1,3 @@
</span><ins>+ftypmp42mp41isommdat'lUI\xC2\xC2A0P$+"A\x88PE1\x92\xC08\x90\x84!B@=\xFF5\xE6\xF3y\xBC6\xDF\xE5|\x9D\xBF\xAA\xC3\xFC\xD7\xFC\xAF\x8Dd\xF8͟\xFE/\xFC_\x8A\xC5\xFF+\xFEW\xF1 \xC6 \xBF\xF1UdW\xF3_\xAD u\xFE\xA0\xB4\xBF\xE5h\xA5\x8DP \xFE\xFA \xF8\xF8\xF8 \xFE\xE4\xEF\xEFO\x8F\x8C\xCE\xFB\xFB\x90 \xD02||7\x9F\xDF܀\xFF \xDF\xDF\xDC\xF8\xF8m\xDF}\xF1\xF0l\xFE\xFE\xF0\x9F\xE1\xB0\xC3c\xDF\xDF\xDC?\xF0\xD8\xEF\xEF\xA0||6>\xFE\xE4\x8F\x83O\xBE\x80\xFF\xC7\xC1\x87\xB8>\xE4>>3\x80\xFE?\xC7 \xF8\x9F\xC7
+_\xC3\xC4K\xF8\xC3\xF2 ' SS \xC1C\x91$ \xF8\x8A(\xA0\xC7w;\xBE\xC3G\xF5nI\xF2\xDF\xEB?\x93\xFB\x8E\x86$\xD4E\xF2\x9D\xAA:\xE8J~C\x80\x8Cmoovlmvhd\xACD\xFF@\xD4trak\tkhd\xFF@pmdia mdhd\xACD\xFFU\xC4,hdlrsounSoundHandler minfsmhd$dinf dref url \xE0stbldstsdTmp4a\xACD0esds\x80\x80\x80 \x80\x80\x80@ww\x80\x80\x80stts stsc stsz\xDF3stco stssDudta4meta hdlrmdirilstXtra
</ins><span class="cx">\ No newline at end of file
</span></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (181173 => 181174)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2015-03-06 19:28:26 UTC (rev 181173)
+++ trunk/Source/WebCore/ChangeLog 2015-03-06 19:31:16 UTC (rev 181174)
</span><span class="lines">@@ -1,3 +1,17 @@
</span><ins>+2015-03-06 Jer Noble <jer.noble@apple.com>
+
+ [Web Audio] Decoding specific .m4a file crashes tab
+ https://bugs.webkit.org/show_bug.cgi?id=139545
+
+ Reviewed by Eric Carlson.
+
+ Test: webaudio/decode-audio-data-too-short.html
+
+ Bail out early if CoreAudio reports the number of frames in the file to be negative.
+
+ * platform/audio/mac/AudioFileReaderMac.cpp:
+ (WebCore::AudioFileReader::createBus):
+
</ins><span class="cx"> 2015-03-06 Jeremy Jones <jeremyj@apple.com>
</span><span class="cx">
</span><span class="cx"> Scroll to make the video element visible when exiting fullscreen.
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformaudiomacAudioFileReaderMaccpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/audio/mac/AudioFileReaderMac.cpp (181173 => 181174)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/audio/mac/AudioFileReaderMac.cpp 2015-03-06 19:28:26 UTC (rev 181173)
+++ trunk/Source/WebCore/platform/audio/mac/AudioFileReaderMac.cpp 2015-03-06 19:31:16 UTC (rev 181174)
</span><span class="lines">@@ -147,7 +147,7 @@
</span><span class="cx"> SInt64 numberOfFrames64 = 0;
</span><span class="cx"> size = sizeof(numberOfFrames64);
</span><span class="cx"> result = ExtAudioFileGetProperty(m_extAudioFileRef, kExtAudioFileProperty_FileLengthFrames, &size, &numberOfFrames64);
</span><del>- if (result != noErr)
</del><ins>+ if (result != noErr || numberOfFrames64 <= 0)
</ins><span class="cx"> return 0;
</span><span class="cx">
</span><span class="cx"> // Sample-rate
</span></span></pre>
</div>
</div>
</body>
</html>