Merge pull request mozilla#4877 from yurydelendik/redircheck

PdfRedirector checks if plugin is still in PlayPreview mode
mjlyons · Jun 2, 2014 · 250d394 · 250d394
2 parents 3408921 + 75d9ae9
commit 250d394
Showing 1 changed file with 4 additions and 0 deletions.
diff --git a/extensions/firefox/content/PdfRedirector.jsm b/extensions/firefox/content/PdfRedirector.jsm
@@ -60,6 +60,10 @@ function getObjectUrl(window) {
   }
 
   // Checking if overlay is a proper PlayPreview overlay.
+  if (element.displayedType !== element.TYPE_NULL ||
+      element.pluginFallbackType !== element.PLUGIN_PLAY_PREVIEW) {
+    return null; // invalid plugin element overlay state
+  }
   for (var i = 0; i < element.children.length; i++) {
     if (element.children[i] === containerElement) {
       return null; // invalid plugin element overlay