Bommels05/Mozilla
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Bug 201084 - [AxPlugin] mozilla crashing in new ActiveXObject(). r=adamlock, sr=alecf (Not part of build)

Browse Source 
git-svn-id: svn://10.0.0.236/trunk@140965 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
dbradley%netscape.com
2003-04-10 07:06:52 +00:00
parent 99ca507781
commit 28e3276c86
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
mozilla/js/src/xpconnect/src/XPCIDispatchExtension.cpp
View File

@@ -44,7 +44,7 @@ static JSBool
CommonConstructor(JSContext *cx, int name, JSObject *obj, uintN argc,
jsval *argv, jsval *rval, PRBool enforceSecurity)
{
XPCCallContext ccx(JS_CALLER, cx, obj);
XPCCallContext ccx(JS_CALLER, cx, JS_GetGlobalObject(cx));
XPCJSRuntime *rt = ccx.GetRuntime();
if (!rt)
{
@@ -96,8 +96,8 @@ CommonConstructor(JSContext *cx, int name, JSObject *obj, uintN argc,
// Get a wrapper for our object
nsCOMPtr<nsIXPConnectJSObjectHolder> holder;
nsresult nsrv = ccx.GetXPConnect()->WrapNative(
ccx, obj, NS_REINTERPRET_CAST(nsISupports*, pDispatch.p), NSID_IDISPATCH,
getter_AddRefs(holder));
ccx, ccx.GetOperandJSObject(), NS_REINTERPRET_CAST(nsISupports*, pDispatch.p),
NSID_IDISPATCH, getter_AddRefs(holder));
if(NS_FAILED(nsrv))
{
XPCThrower::Throw(nsrv, ccx);