From 28e3276c8691d45cfcb7d0465a02dc6b7c8f0c0f Mon Sep 17 00:00:00 2001
From: "dbradley%netscape.com"
 <dbradley%netscape.com@18797224-902f-48f8-a5cc-f745e15eee43>
Date: Thu, 10 Apr 2003 07:06:52 +0000
Subject: [PATCH] Bug 201084 - [AxPlugin] mozilla crashing in  new
 ActiveXObject(). r=adamlock, sr=alecf (Not part of build)

git-svn-id: svn://10.0.0.236/trunk@140965 18797224-902f-48f8-a5cc-f745e15eee43
---
 mozilla/js/src/xpconnect/src/XPCIDispatchExtension.cpp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/mozilla/js/src/xpconnect/src/XPCIDispatchExtension.cpp b/mozilla/js/src/xpconnect/src/XPCIDispatchExtension.cpp
index 39cb63f43a8..956503ab3c4 100644
--- a/mozilla/js/src/xpconnect/src/XPCIDispatchExtension.cpp
+++ b/mozilla/js/src/xpconnect/src/XPCIDispatchExtension.cpp
@@ -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);