From dedc247d0e7fa693f3670bd393b80349cf5cd161 Mon Sep 17 00:00:00 2001
From: "sayrer%gmail.com"
 <sayrer%gmail.com@18797224-902f-48f8-a5cc-f745e15eee43>
Date: Sun, 30 Sep 2007 06:19:52 +0000
Subject: [PATCH] Bug 396828. 'Assertion failure: (cx)->requestDepth ||
 (cx)->thread == (cx)->runtime->gcThread' within ns4xPluginInstance::Stop.
 r=jst, sr=brendan, a=jst

git-svn-id: svn://10.0.0.236/trunk@236938 18797224-902f-48f8-a5cc-f745e15eee43
---
 mozilla/modules/plugin/base/src/nsJSNPRuntime.cpp | 4 ++++
 1 file changed, 4 insertions(+)

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,