diff --git a/mozilla/modules/plugin/base/src/nsJSNPRuntime.cpp b/mozilla/modules/plugin/base/src/nsJSNPRuntime.cpp
index 1bb3f5c2b28..bbe511ec70a 100644
--- a/mozilla/modules/plugin/base/src/nsJSNPRuntime.cpp
+++ b/mozilla/modules/plugin/base/src/nsJSNPRuntime.cpp
@@ -818,6 +818,8 @@ nsJSObjWrapper::NP_Enumerate(NPObject *npobj, NPIdentifier **identifier,
 
   AutoCXPusher pusher(cx);
 
+  JSAutoRequest ar(cx);
+
   JSIdArray *ida = ::JS_Enumerate(cx, npjsobj->mJSObj);
   if (!ida) {
     return PR_FALSE;
@@ -1669,6 +1671,8 @@ nsJSNPRuntime::OnPluginDestroy(NPP npp)
     return;
   }
 
+  JSAutoRequest ar(cx);
+
   if (sNPObjWrappers.ops) {
     NppAndCx nppcx = { npp, cx };
     PL_DHashTableEnumerate(&sNPObjWrappers,