Don't allow nodes of one context to be connected to nodes of another context

Chris Rogers · Chris Rogers · commit f64db6fbbf50 · 2011-08-30T23:45:53.000Z
https://bugs.webkit.org/show_bug.cgi?id=67245 Source/WebCore: Reviewed by Dimitri Glazkov. Tests: updated webaudio/audionode.html * webaudio/AudioNode.cpp: (WebCore::AudioNode::connect): LayoutTests: Reviewed by Dimitri Glazkov. * webaudio/audionode-expected.txt: * webaudio/audionode.html: Canonical link: https://commits.webkit.org/83054@main git-svn-id: https://svn.webkit.org/repository/webkit/trunk@94127 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
@@ -1,3 +1,13 @@
+2011-08-30  Chris Rogers  <crogers@google.com>
+
+        Don't allow nodes of one context to be connected to nodes of another context
+        https://bugs.webkit.org/show_bug.cgi?id=67245
+
+        Reviewed by Dimitri Glazkov.
+
+        * webaudio/audionode-expected.txt:
+        * webaudio/audionode.html:
+
 2011-08-30  Aaron Colwell  <acolwell@chromium.org>
 
         Add MediaSource API to HTMLMediaElement
diff --git a/LayoutTests/webaudio/audionode-expected.txt b/LayoutTests/webaudio/audionode-expected.txt
@@ -11,6 +11,7 @@ PASS connect() exception thrown for illegal destination AudioNode.
 PASS connect() exception thrown for illegal output index.
 PASS connect() exception thrown for illegal input index.
 PASS audioNode.connect(context.destination) succeeded.
+PASS exception thrown when connecting to other context's node.
 PASS successfullyParsed is true
 
 TEST COMPLETE
diff --git a/LayoutTests/webaudio/audionode.html b/LayoutTests/webaudio/audionode.html
@@ -15,6 +15,7 @@
 description("Basic tests for AudioNode API.");
 
 var context = 0;
+var context2 = 0;
 
 function runTest() {
     if (window.layoutTestController) {
@@ -72,6 +73,15 @@
     } catch(e) {
         testFailed("audioNode.connect(context.destination) failed.");
     }
+    
+    // Create a new context and try to connect the other context's node to this one.
+    try {
+        context2 = new webkitAudioContext();
+        window.audioNode.connect(context2.destination);
+        testFailed("exception should be thrown when connecting to other context's node.");
+    } catch(e) {
+        testPassed("exception thrown when connecting to other context's node.");
+    }
 
     finishJSTest();
 }
diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
@@ -1,3 +1,15 @@
+2011-08-30  Chris Rogers  <crogers@google.com>
+
+        Don't allow nodes of one context to be connected to nodes of another context
+        https://bugs.webkit.org/show_bug.cgi?id=67245
+
+        Reviewed by Dimitri Glazkov.
+        
+        Tests: updated webaudio/audionode.html
+
+        * webaudio/AudioNode.cpp:
+        (WebCore::AudioNode::connect):
+        
 2011-08-30  Dan Bernstein  <mitz@apple.com>
 
         WebCore part of <rdar://problem/9281695> Add text search API for getting the DOM range of a text match
diff --git a/Source/WebCore/webaudio/AudioNode.cpp b/Source/WebCore/webaudio/AudioNode.cpp
@@ -126,6 +126,9 @@ bool AudioNode::connect(AudioNode* destination, unsigned outputIndex, unsigned i
         output->disconnectAllInputs();
         return true;
     }
+    
+    if (context() != destination->context())
+        return false;
 
     AudioNodeInput* input = destination->input(inputIndex);
     input->connect(output);

Original file line number	Diff line number	Diff line change
`@@ -126,6 +126,9 @@ bool AudioNode::connect(AudioNode* destination, unsigned outputIndex, unsigned i`
`126`	`126`	`output->disconnectAllInputs();`
`127`	`127`	`return true;`
`128`	`128`	`}`
	`129`	`+`
	`130`	`+ if (context() != destination->context())`
	`131`	`+ return false;`
`129`	`132`
`130`	`133`	`AudioNodeInput* input = destination->input(inputIndex);`
`131`	`134`	`input->connect(output);`