583099 - toolkit/components/ctypes uses the wrong global object

Status: RESOLVED FIXED

(Core :: js-ctypes, defect)

Description

[Zack Weinberg (:zwol)]

http://mxr.mozilla.org/mozilla-central/source/toolkit/components/ctypes/Module.cpp#107 reads:

107 NS_IMETHODIMP
108 Module::Call(nsIXPConnectWrappedNative* wrapper,
109              JSContext* cx,
110              JSObject* obj,
111              PRUint32 argc,
112              jsval* argv,
113              jsval* vp,
114              PRBool* _retval)
115 {
116   JSObject* global = JS_GetGlobalObject(cx);
117   *_retval = InitAndSealCTypesClass(cx, global);
118   return NS_OK;
119 }

Per jst, this is not the correct global object to use here: it should instead look something like this:

{
  JSObject* scope = JS_GetScopeChain(cx);
  if (!scope)
    return NS_ERROR_NOT_AVAILABLE;

  JSObject* global = JS_GetGlobalForObject(cx, scope);
  if (!global)
    return NS_ERROR_NOT_AVAILABLE;

  *_retval = InitAndSealCTypesClass(cx, global);
  return NS_OK;
}

Comment 1

[[e-mail]]

Attachment: patch

If jst says so! jorendorff, does this look right to you?

Comment 2

[Jason Orendorff [:jorendorff]]

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

Right ...but you might as well use JS_GetGlobalForScopeChain(cx), which does the same thing in a single call.

Comment 3

[[e-mail]]

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

Will do. Simple correctness fix; requesting approval.

Comment 4

[[e-mail]]

http://hg.mozilla.org/tracemonkey/rev/736566d21998

Comment 5

[Robert Sayre]

http://hg.mozilla.org/mozilla-central/rev/736566d21998