From 1268f1183ce2362ed4bdbd8ca9986e151d9d4f4d Mon Sep 17 00:00:00 2001
From: Johnny Stenback <jst@mozilla.com>
Date: Tue, 18 Jan 2011 15:49:34 -0800
Subject: [PATCH] Bug 608987. Fixing compartment mismatch when setting up the
 proto chain of a plugin object. r=gal@uci.edu, a=blocker

---
 dom/base/nsDOMClassInfo.cpp | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/dom/base/nsDOMClassInfo.cpp b/dom/base/nsDOMClassInfo.cpp
index c2ec42681272..7d9ba36c614e 100644
--- a/dom/base/nsDOMClassInfo.cpp
+++ b/dom/base/nsDOMClassInfo.cpp
@@ -9611,6 +9611,11 @@ nsHTMLPluginObjElementSH::SetupProtoChain(nsIXPConnectWrappedNative *wrapper,
     return NS_OK;
   }
 
+  JSAutoEnterCompartment ac;
+  if (!ac.enter(cx, obj)) {
+    return NS_ERROR_UNEXPECTED;
+  }
+
   nsCOMPtr<nsIPluginInstance> pi;
   nsresult rv = GetPluginInstanceIfSafe(wrapper, obj, getter_AddRefs(pi));
   NS_ENSURE_SUCCESS(rv, rv);