Bug 1384247 - Check if an HTMLMediaElement can be capture before doing it. r=dminor

MozReview-Commit-ID: EWpf2qA2Yce --HG-- extra : rebase_source : 295f5e27e4fc983cbef1e40d65775abbb99012a6
2017-07-27 16:02:28 +02:00 · 2017-07-27 16:02:28 +02:00 · c08b4966b1
--- a/dom/html/HTMLMediaElement.cpp
+++ b/dom/html/HTMLMediaElement.cpp
@ -3535,6 +3535,11 @@ HTMLMediaElement::CaptureAudio(ErrorResult& aRv,
 {
  MOZ_RELEASE_ASSERT(aGraph);

+  if (!CanBeCaptured(false)) {
+    aRv.Throw(NS_ERROR_FAILURE);
+    return nullptr;
+  }
+
  RefPtr<DOMMediaStream> stream =
    CaptureStreamInternal(false, true, aGraph);
  if (!stream) {
--- a/dom/media/test/crashtests/1384248.html
+++ b/dom/media/test/crashtests/1384248.html
@ -0,0 +1,10 @@
+<html>
+  <head>
+    <script>
+      try { o1 = document.createElement('audio') } catch(e) { }
+      try { o2 = document.implementation.createDocument('', '', null).adoptNode(o1); } catch(e) { };
+      try { o3 = new AudioContext('alarm') } catch(e) { }
+      try { o3.createMediaElementSource(o1) } catch(e) { }
+    </script>
+  </head>
+</html>
--- a/dom/media/test/crashtests/crashtests.list
+++ b/dom/media/test/crashtests/crashtests.list
@ -84,6 +84,7 @@ load 1185192.html
 load 1304948.html
 load 1319486.html
 load 1291702.html
+load 1384248.html
 load disconnect-wrong-destination.html
 load analyser-channels-1.html
 load audiocontext-double-suspend.html