592184 - TM: XPC_WN_CallMethod has to set the right compartment

Status: RESOLVED FIXED

(Core :: JavaScript Engine, defect)

Description

[Gregor Wagner [:gwagner]]

Attachment: gdb output

Comment 1

[Gregor Wagner [:gwagner]]

Attachment: patch

Comment 2

[Andreas Gal :gal]

Comment on attachment 471161 [details] [diff] [review]
patch

>diff -r 18e3ee80322f js/src/jsapi.cpp
>--- a/js/src/jsapi.cpp	Tue Aug 31 11:48:58 2010 -0700
>+++ b/js/src/jsapi.cpp	Wed Sep 01 10:12:02 2010 -0700
>@@ -1186,17 +1186,17 @@ JSAutoEnterCompartment::JSAutoEnterCompa
>   : cx(cx), compartment(cx->compartment)
> {
>     cx->compartment = newCompartment;
> }
> 
> JSAutoEnterCompartment::JSAutoEnterCompartment(JSContext *cx, JSObject *target)
>   : cx(cx), compartment(cx->compartment)
> {
>-    cx->compartment = target->getCompartment(cx);
>+    cx->compartment = target ? target->getCompartment(cx) : cx->runtime->defaultCompartment;

This change is not needed any more.

Comment 3

[Gregor Wagner [:gwagner]]

Attachment: patch

Comment 4

[Gregor Wagner [:gwagner]]

http://hg.mozilla.org/tracemonkey/rev/0a7c7b2732cd

Comment 5

[(dormant account)]

Comment on attachment 471168 [details] [diff] [review]
patch

>     rv = mSystemPrincipal->GetJSPrincipals(cx, &jsPrincipals);
>     NS_ENSURE_SUCCESS(rv, rv);
> 
>     JSPrincipalsHolder princHolder(mContext, jsPrincipals);
> #endif
> 
>     nsCOMPtr<nsIXPCScriptable> backstagePass;
>@@ -1464,16 +1469,19 @@ mozJSComponentLoader::ImportInto(const n
>     }
> 
>     NS_ASSERTION(mod->global, "Import table contains entry with no global");
>     *_retval = mod->global;
> 
>     jsval symbols;
>     if (targetObj) {
>         JSCLContextHelper cxhelper(this);
>+        JSAutoCrossCompartmentCall ac;
>+        if (!ac.enter(mContext, mod->global))
>+            return NULL;

returning a NULL as a nsresult :(

Comment 6

[Andreas Gal :gal]

ouch, sorry. Gregor, want to file a bug and fix this?

Comment 7

[Chris Leary [:cdleary] (not checking bugmail)]

http://hg.mozilla.org/mozilla-central/rev/0a7c7b2732cd