mozilla-central: changeset 62603:532ee628dc4fadf2a51b6c3ed77b47f024519d4c

author	Andreas Gal <gal@mozilla.com>
	Tue, 15 Feb 2011 11:17:14 -0800
changeset 62603	532ee628dc4fadf2a51b6c3ed77b47f024519d4c
parent 62602	1e38ca07f02f5a2ca7f3f4476c0e21fd284fe6e4
child 62604	d3bcd1655cc59a964b86b3646eb7c1161e1136e4
push id	18793
push user	cleary@mozilla.com
push date	Tue, 15 Feb 2011 20:07:31 +0000
treeherder	mozilla-central@cdde780d7503 [default view] [failures only]
perfherder	[talos] [build metrics] [platform microbench] (compared to previous push)
reviewers	mrbkap
bugs	634236
milestone	2.0b12pre
first release with	nightly linux32 b4aa47ca42c1 / 4.0b12pre / 20110216030352 / files nightly linux64 b4aa47ca42c1 / 4.0b12pre / 20110216030352 / files nightly mac b4aa47ca42c1 / 4.0b12pre / 20110216030352 / files nightly win32 b4aa47ca42c1 / 4.0b12pre / 20110216030352 / files nightly win64 ab0dc35174fb / 4.0b12pre / 20110216030204 / files
last release without	nightly linux32 1ed3464aaa92 / 4.0b12pre / 20110211030400 / files nightly linux64 1ed3464aaa92 / 4.0b12pre / 20110211030400 / files nightly mac 1ed3464aaa92 / 4.0b12pre / 20110211030400 / files nightly win32 1ed3464aaa92 / 4.0b12pre / 20110211030400 / files nightly win64 8013e7a30984 / 4.0b12pre / 20110211030236 / files

--- a/js/src/jscompartment.cpp
+++ b/js/src/jscompartment.cpp
@@ -175,17 +175,18 @@ JSCompartment::arenaListsAreEmpty()
            return false;
   }
   return true;
 }
 
 static bool
 IsCrossCompartmentWrapper(JSObject *wrapper)
 {
-    return !!(JSWrapper::wrapperHandler(wrapper)->flags() & JSWrapper::CROSS_COMPARTMENT);
+    return wrapper->isWrapper() &&
+           !!(JSWrapper::wrapperHandler(wrapper)->flags() & JSWrapper::CROSS_COMPARTMENT);
 }
 
 bool
 JSCompartment::wrap(JSContext *cx, Value *vp)
 {
     JS_ASSERT(cx->compartment == this);
 
     uintN flags = 0;