Changeset 94878 in webkit

Timestamp:

Sep 9, 2011 3:15:37 PM (13 years ago)

Author:

crogers@google.com

Message:

AudioBufferSourceNode must validate AudioBuffer in .buffer attribute setter
​https://bugs.webkit.org/show_bug.cgi?id=67749

Reviewed by Kenneth Russell.

Source/WebCore:

Test: webaudio/audiobuffersource-channels.html

• WebCore.gypi:
• bindings/js/JSAudioBufferSourceNodeCustom.cpp:

(WebCore::JSAudioBufferSourceNode::setBuffer):

• bindings/v8/custom/V8AudioBufferSourceNodeCustom.cpp: Copied from Source/WebCore/bindings/js/JSAudioBufferSourceNodeCustom.cpp.

(WebCore::V8AudioBufferSourceNode::bufferAccessorSetter):

• webaudio/AudioBufferSourceNode.cpp:

(WebCore::AudioBufferSourceNode::setBuffer):

• webaudio/AudioBufferSourceNode.h:
• webaudio/AudioBufferSourceNode.idl:

LayoutTests:

• webaudio/audiobuffersource-channels-expected.txt: Added.
• webaudio/audiobuffersource-channels.html: Added.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/webaudio/audiobuffersource-channels-expected.txt (added)
• LayoutTests/webaudio/audiobuffersource-channels.html (added)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/WebCore.gypi (modified) (1 diff)
• Source/WebCore/bindings/js/JSAudioBufferSourceNodeCustom.cpp (modified) (2 diffs)
• Source/WebCore/bindings/v8/custom/V8AudioBufferSourceNodeCustom.cpp (copied) (copied from trunk/Source/WebCore/bindings/js/JSAudioBufferSourceNodeCustom.cpp) (2 diffs)
• Source/WebCore/webaudio/AudioBufferSourceNode.cpp (modified) (3 diffs)
• Source/WebCore/webaudio/AudioBufferSourceNode.h (modified) (1 diff)
• Source/WebCore/webaudio/AudioBufferSourceNode.idl (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2011-09-09  Chris Rogers  <crogers@google.com>
+
+        AudioBufferSourceNode must validate AudioBuffer in .buffer attribute setter
+        https://bugs.webkit.org/show_bug.cgi?id=67749
+
+        Reviewed by Kenneth Russell.
+
+        * webaudio/audiobuffersource-channels-expected.txt: Added.
+        * webaudio/audiobuffersource-channels.html: Added.
+
 2011-09-09  Ryosuke Niwa  <rniwa@webkit.org>
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2011-09-09  Chris Rogers  <crogers@google.com>
+
+        AudioBufferSourceNode must validate AudioBuffer in .buffer attribute setter
+        https://bugs.webkit.org/show_bug.cgi?id=67749
+
+        Reviewed by Kenneth Russell.
+
+        Test: webaudio/audiobuffersource-channels.html
+
+        * WebCore.gypi:
+        * bindings/js/JSAudioBufferSourceNodeCustom.cpp:
+        (WebCore::JSAudioBufferSourceNode::setBuffer):
+        * bindings/v8/custom/V8AudioBufferSourceNodeCustom.cpp: Copied from Source/WebCore/bindings/js/JSAudioBufferSourceNodeCustom.cpp.
+        (WebCore::V8AudioBufferSourceNode::bufferAccessorSetter):
+        * webaudio/AudioBufferSourceNode.cpp:
+        (WebCore::AudioBufferSourceNode::setBuffer):
+        * webaudio/AudioBufferSourceNode.h:
+        * webaudio/AudioBufferSourceNode.idl:
+
 2011-09-09  Dan Bernstein  <mitz@apple.com>
 

trunk/Source/WebCore/WebCore.gypi

@@ -2118 +2118 @@
             'bindings/v8/custom/V8ArrayBufferCustom.cpp',
             'bindings/v8/custom/V8ArrayBufferViewCustom.h',
+            'bindings/v8/custom/V8AudioBufferSourceNodeCustom.cpp',
             'bindings/v8/custom/V8AudioContextCustom.cpp',
             'bindings/v8/custom/V8AudioNodeCustom.cpp',

trunk/Source/WebCore/bindings/js/JSAudioBufferSourceNodeCustom.cpp

@@ -27 +27 @@
 #if ENABLE(WEB_AUDIO)
 
-#include "AudioBufferSourceNode.h"
+#include "JSAudioBufferSourceNode.h"
 
 #include "AudioBuffer.h"
+#include "AudioBufferSourceNode.h"
 #include "JSAudioBuffer.h"
-#include "JSAudioBufferSourceNode.h"
+#include <runtime/Error.h>
 
 using namespace JSC;
@@ -37 +38 @@
 namespace WebCore {
 
-void JSAudioBufferSourceNode::setBuffer(ExecState*, JSValue value)
+void JSAudioBufferSourceNode::setBuffer(ExecState* exec, JSValue value)
 {
     AudioBufferSourceNode* imp = static_cast<AudioBufferSourceNode*>(impl());
-    imp->setBuffer(toAudioBuffer(value));
+    AudioBuffer* buffer = toAudioBuffer(value);
+    if (!buffer) {
+        throwError(exec, createSyntaxError(exec, "Value is not of type AudioBuffer"));
+        return;
+    }
+    
+    if (!imp->setBuffer(buffer))
+        throwError(exec, createSyntaxError(exec, "AudioBuffer unsupported number of channels"));
 }
 

trunk/Source/WebCore/bindings/v8/custom/V8AudioBufferSourceNodeCustom.cpp

@@ -1 +1 @@
 /*
- * Copyright (C) 2010, Google Inc. All rights reserved.
+ * Copyright (C) 2011, Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -27 +27 @@
 #if ENABLE(WEB_AUDIO)
 
-#include "AudioBufferSourceNode.h"
+#include "V8AudioBufferSourceNode.h"
 
 #include "AudioBuffer.h"
-#include "JSAudioBuffer.h"
-#include "JSAudioBufferSourceNode.h"
-
-using namespace JSC;
+#include "AudioBufferSourceNode.h"
+#include "ExceptionCode.h"
+#include "V8AudioBuffer.h"
+#include "V8Binding.h"
+#include "V8Proxy.h"
 
 namespace WebCore {
 
-void JSAudioBufferSourceNode::setBuffer(ExecState*, JSValue value)
+void V8AudioBufferSourceNode::bufferAccessorSetter(v8::Local<v8::String> name, v8::Local<v8::Value> value, const v8::AccessorInfo& info)
 {
-    AudioBufferSourceNode* imp = static_cast<AudioBufferSourceNode*>(impl());
-    imp->setBuffer(toAudioBuffer(value));
+    INC_STATS("DOM.AudioBufferSourceNode.buffer._set");
+    v8::Handle<v8::Object> holder = info.Holder();
+    AudioBufferSourceNode* imp = V8AudioBufferSourceNode::toNative(holder);
+
+    AudioBuffer* buffer = 0;
+    if (V8AudioBuffer::HasInstance(value)) {
+        buffer = V8AudioBuffer::toNative(value->ToObject());
+        if (buffer && !imp->setBuffer(buffer)) {
+            throwError("AudioBuffer unsupported number of channels");
+            return;
+        }
+    }
+    
+    if (!buffer) {
+        throwError("Value is not of type AudioBuffer");
+        return;
+    }
 }
 

trunk/Source/WebCore/webaudio/AudioBufferSourceNode.cpp

@@ -325 +325 @@
 }
 
-void AudioBufferSourceNode::setBuffer(AudioBuffer* buffer)
+bool AudioBufferSourceNode::setBuffer(AudioBuffer* buffer)
 {
     ASSERT(isMainThread());
@@ -338 +338 @@
         // Do any necesssary re-configuration to the buffer's number of channels.
         unsigned numberOfChannels = buffer->numberOfChannels();
+        if (!numberOfChannels || numberOfChannels > 2) {
+            // FIXME: implement multi-channel greater than stereo.
+            return false;
+        }
         output(0)->setNumberOfChannels(numberOfChannels);
     }
@@ -343 +347 @@
     m_virtualReadIndex = 0;
     m_buffer = buffer;
+    
+    return true;
 }
 

trunk/Source/WebCore/webaudio/AudioBufferSourceNode.h

@@ -53 +53 @@
     
     // setBuffer() is called on the main thread.  This is the buffer we use for playback.
-    void setBuffer(AudioBuffer*);
+    // returns true on success.
+    bool setBuffer(AudioBuffer*);
     AudioBuffer* buffer() { return m_buffer.get(); }
                     

trunk/Source/WebCore/webaudio/AudioBufferSourceNode.idl

@@ -29 +29 @@
         GenerateToJS
     ] AudioBufferSourceNode : AudioSourceNode {
-        attribute [JSCCustomSetter] AudioBuffer buffer;
+        attribute [CustomSetter] AudioBuffer buffer
+            setter raises (DOMException);
 
         readonly attribute AudioGain gain;