<!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>[214618] 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/214618">214618</a></dd>
<dt>Author</dt> <dd>eric.carlson@apple.com</dd>
<dt>Date</dt> <dd>2017-03-30 13:17:08 -0700 (Thu, 30 Mar 2017)</dd>
</dl>
<h3>Log Message</h3>
<pre>[Crash] WebCore::AudioBuffer::AudioBuffer don't checking illegal value
https://bugs.webkit.org/show_bug.cgi?id=169956
Reviewed by Youenn Fablet.
Source/WebCore:
Test: webaudio/audiobuffer-crash.html
* Modules/webaudio/AudioBuffer.cpp:
(WebCore::AudioBuffer::AudioBuffer): Invalidate the object and return early if the channel
array allocation fails.
(WebCore::AudioBuffer::AudioBuffer): Ditto.
(WebCore::AudioBuffer::invalidate): Invalidate the object.
* Modules/webaudio/AudioBuffer.h:
LayoutTests:
* webaudio/audiobuffer-crash-expected.txt: Added.
* webaudio/audiobuffer-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="#trunkSourceWebCoreModuleswebaudioAudioBuffercpp">trunk/Source/WebCore/Modules/webaudio/AudioBuffer.cpp</a></li>
<li><a href="#trunkSourceWebCoreModuleswebaudioAudioBufferh">trunk/Source/WebCore/Modules/webaudio/AudioBuffer.h</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkLayoutTestswebaudioaudiobuffercrashexpectedtxt">trunk/LayoutTests/webaudio/audiobuffer-crash-expected.txt</a></li>
<li><a href="#trunkLayoutTestswebaudioaudiobuffercrashhtml">trunk/LayoutTests/webaudio/audiobuffer-crash.html</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (214617 => 214618)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2017-03-30 20:17:08 UTC (rev 214617)
+++ trunk/LayoutTests/ChangeLog 2017-03-30 20:17:08 UTC (rev 214618)
</span><span class="lines">@@ -1,3 +1,13 @@
</span><ins>+2017-03-30 Eric Carlson <eric.carlson@apple.com>
+
+ [Crash] WebCore::AudioBuffer::AudioBuffer don't checking illegal value
+ https://bugs.webkit.org/show_bug.cgi?id=169956
+
+ Reviewed by Youenn Fablet.
+
+ * webaudio/audiobuffer-crash-expected.txt: Added.
+ * webaudio/audiobuffer-crash.html: Added.
+
</ins><span class="cx"> 2017-03-30 Simon Fraser <simon.fraser@apple.com>
</span><span class="cx">
</span><span class="cx"> Add some tests that dump the touch event regions with various content configurations
</span></span></pre></div>
<a id="trunkLayoutTestswebaudioaudiobuffercrashexpectedtxt"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/webaudio/audiobuffer-crash-expected.txt (0 => 214618)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/webaudio/audiobuffer-crash-expected.txt (rev 0)
+++ trunk/LayoutTests/webaudio/audiobuffer-crash-expected.txt 2017-03-30 20:17:08 UTC (rev 214618)
</span><span class="lines">@@ -0,0 +1,11 @@
</span><ins>+Attempting to create a large AudioBuffer should not crash.
+
+On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
+
+
+PASS context = new webkitAudioContext().createBuffer(1, -1, 44100) threw exception NotSupportedError (DOM Exception 9): The operation is not supported..
+PASS Test passed because if it didn't crash.
+PASS successfullyParsed is true
+
+TEST COMPLETE
+
</ins></span></pre></div>
<a id="trunkLayoutTestswebaudioaudiobuffercrashhtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/webaudio/audiobuffer-crash.html (0 => 214618)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/webaudio/audiobuffer-crash.html (rev 0)
+++ trunk/LayoutTests/webaudio/audiobuffer-crash.html 2017-03-30 20:17:08 UTC (rev 214618)
</span><span class="lines">@@ -0,0 +1,15 @@
</span><ins>+<!DOCTYPE html>
+<html>
+ <head>
+ <script src="../resources/js-test-pre.js"></script>
+ </head>
+ <body>
+ <script>
+ description("Attempting to create a large AudioBuffer should not crash.");
+ shouldThrow("context = new webkitAudioContext().createBuffer(1, -1, 44100)");
+ testPassed("Test passed because if it didn't crash.");
+ </script>
+
+ <script src="../resources/js-test-post.js"></script>
+ </body>
+</html>
</ins></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (214617 => 214618)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2017-03-30 20:17:08 UTC (rev 214617)
+++ trunk/Source/WebCore/ChangeLog 2017-03-30 20:17:08 UTC (rev 214618)
</span><span class="lines">@@ -1,3 +1,19 @@
</span><ins>+2017-03-30 Eric Carlson <eric.carlson@apple.com>
+
+ [Crash] WebCore::AudioBuffer::AudioBuffer don't checking illegal value
+ https://bugs.webkit.org/show_bug.cgi?id=169956
+
+ Reviewed by Youenn Fablet.
+
+ Test: webaudio/audiobuffer-crash.html
+
+ * Modules/webaudio/AudioBuffer.cpp:
+ (WebCore::AudioBuffer::AudioBuffer): Invalidate the object and return early if the channel
+ array allocation fails.
+ (WebCore::AudioBuffer::AudioBuffer): Ditto.
+ (WebCore::AudioBuffer::invalidate): Invalidate the object.
+ * Modules/webaudio/AudioBuffer.h:
+
</ins><span class="cx"> 2017-03-30 Antoine Quint <graouts@apple.com>
</span><span class="cx">
</span><span class="cx"> [mac-wk1] LayoutTest media/modern-media-controls/airplay-button/airplay-button.html is a flaky timeout
</span></span></pre></div>
<a id="trunkSourceWebCoreModuleswebaudioAudioBuffercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/webaudio/AudioBuffer.cpp (214617 => 214618)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/webaudio/AudioBuffer.cpp 2017-03-30 20:17:08 UTC (rev 214617)
+++ trunk/Source/WebCore/Modules/webaudio/AudioBuffer.cpp 2017-03-30 20:17:08 UTC (rev 214618)
</span><span class="lines">@@ -43,7 +43,12 @@
</span><span class="cx"> {
</span><span class="cx"> if (sampleRate < 22050 || sampleRate > 96000 || numberOfChannels > AudioContext::maxNumberOfChannels() || !numberOfFrames)
</span><span class="cx"> return nullptr;
</span><del>- return adoptRef(*new AudioBuffer(numberOfChannels, numberOfFrames, sampleRate));
</del><ins>+
+ auto buffer = adoptRef(*new AudioBuffer(numberOfChannels, numberOfFrames, sampleRate));
+ if (!buffer->m_length)
+ return nullptr;
+
+ return WTFMove(buffer);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> RefPtr<AudioBuffer> AudioBuffer::createFromAudioFileData(const void* data, size_t dataSize, bool mixToMono, float sampleRate)
</span><span class="lines">@@ -61,9 +66,14 @@
</span><span class="cx"> m_channels.reserveCapacity(numberOfChannels);
</span><span class="cx">
</span><span class="cx"> for (unsigned i = 0; i < numberOfChannels; ++i) {
</span><del>- RefPtr<Float32Array> channelDataArray = Float32Array::create(m_length);
</del><ins>+ auto channelDataArray = Float32Array::create(m_length);
+ if (!channelDataArray) {
+ invalidate();
+ break;
+ }
+
</ins><span class="cx"> channelDataArray->setNeuterable(false);
</span><del>- m_channels.append(channelDataArray);
</del><ins>+ m_channels.append(WTFMove(channelDataArray));
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -76,6 +86,11 @@
</span><span class="cx"> m_channels.reserveCapacity(numberOfChannels);
</span><span class="cx"> for (unsigned i = 0; i < numberOfChannels; ++i) {
</span><span class="cx"> auto channelDataArray = Float32Array::create(m_length);
</span><ins>+ if (!channelDataArray) {
+ invalidate();
+ break;
+ }
+
</ins><span class="cx"> channelDataArray->setNeuterable(false);
</span><span class="cx"> channelDataArray->setRange(bus.channel(i)->data(), m_length, 0);
</span><span class="cx"> m_channels.append(WTFMove(channelDataArray));
</span><span class="lines">@@ -82,6 +97,12 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+void AudioBuffer::invalidate()
+{
+ releaseMemory();
+ m_length = 0;
+}
+
</ins><span class="cx"> void AudioBuffer::releaseMemory()
</span><span class="cx"> {
</span><span class="cx"> m_channels.clear();
</span></span></pre></div>
<a id="trunkSourceWebCoreModuleswebaudioAudioBufferh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/webaudio/AudioBuffer.h (214617 => 214618)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/webaudio/AudioBuffer.h 2017-03-30 20:17:08 UTC (rev 214617)
+++ trunk/Source/WebCore/Modules/webaudio/AudioBuffer.h 2017-03-30 20:17:08 UTC (rev 214618)
</span><span class="lines">@@ -69,6 +69,8 @@
</span><span class="cx"> AudioBuffer(unsigned numberOfChannels, size_t numberOfFrames, float sampleRate);
</span><span class="cx"> explicit AudioBuffer(AudioBus&);
</span><span class="cx">
</span><ins>+ void invalidate();
+
</ins><span class="cx"> double m_gain { 1.0 }; // scalar gain
</span><span class="cx"> float m_sampleRate;
</span><span class="cx"> size_t m_length;
</span></span></pre>
</div>
</div>
</body>
</html>