commit 57d9a8971efde965d1313c6bbb7ab98cd5f4e44e Author: Yury Delendik ydelendik@mozilla.com Date: Fri May 30 18:03:05 2014 -0500

Bug 1015636 - Check if PDF Viewer embed overlay has valid state. r=johns, a=dveditz --- browser/extensions/pdfjs/components/PdfRedirector.js | 4 ++++ 1 file changed, 4 insertions(+)

diff --git a/browser/extensions/pdfjs/components/PdfRedirector.js b/browser/extensions/pdfjs/components/PdfRedirector.js index 4a08ec2..2758ffe 100644 --- a/browser/extensions/pdfjs/components/PdfRedirector.js +++ b/browser/extensions/pdfjs/components/PdfRedirector.js @@ -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