Bug 587182 - Implicit native wrapper in content code assertion fix. r=gal
authorBlake Kaplan <mrbkap@gmail.com>
Fri, 13 Aug 2010 20:12:46 -0700
changeset 50575 bcd40dd716400c3f44ec4afdfff30eb667759da5
parent 50574 0346acf59bc6e82c9ee3e752d4e9b3f782ffe302
child 50576 d5d9ca9a444597a37b24a4a927f7e9f37a381e0d
push id1
push userroot
push dateTue, 26 Apr 2011 22:38:44 +0000
treeherdermozilla-beta@bfdb6e623a36 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersgal
bugs587182
milestone2.0b4pre
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 587182 - Implicit native wrapper in content code assertion fix. r=gal
js/src/xpconnect/src/XPCNativeWrapper.cpp
--- a/js/src/xpconnect/src/XPCNativeWrapper.cpp
+++ b/js/src/xpconnect/src/XPCNativeWrapper.cpp
@@ -380,18 +380,18 @@ EnsureLegalActivity(JSContext *cx, JSObj
   uint32 fileFlags = JS_GetScriptFilenameFlags(script);
   if (fileFlags == JSFILENAME_NULL || (fileFlags & JSFILENAME_SYSTEM)) {
     // We expect implicit native wrappers in system files.
     return JS_TRUE;
   }
 
   // Otherwise, we're looking at a non-system file with a handle on an
   // implicit wrapper. This is a bug! Deny access.
-  NS_ERROR("Implicit native wrapper in content code");
-  return JS_FALSE;
+  NS_WARNING("Implicit native wrapper in content code");
+  return JS_TRUE;
 #else
   return JS_TRUE;
 #endif
 
   // NB: Watch for early returns in the ifdef DEBUG code above.
 }
 
 static JSBool