From 4e9ab57fc4be34cf203313aefbf88bd2af0a964b Mon Sep 17 00:00:00 2001 From: "brendan%mozilla.org" Date: Mon, 15 Sep 2003 21:57:31 +0000 Subject: [PATCH] Fix venkman-induced GC-hazard crash bug: keep the nsIXPConnectJSObjectHolder for scriptObject alive across the entire extent of the scriptObject variable (171949, r=peterv, sr=bryner). git-svn-id: svn://10.0.0.236/trunk@146929 18797224-902f-48f8-a5cc-f745e15eee43 --- mozilla/content/xbl/src/nsXBLPrototypeHandler.cpp | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/mozilla/content/xbl/src/nsXBLPrototypeHandler.cpp b/mozilla/content/xbl/src/nsXBLPrototypeHandler.cpp index f047bc9a1e1..c3913cedfa7 100644 --- a/mozilla/content/xbl/src/nsXBLPrototypeHandler.cpp +++ b/mozilla/content/xbl/src/nsXBLPrototypeHandler.cpp @@ -403,6 +403,10 @@ nsXBLPrototypeHandler::ExecuteHandler(nsIDOMEventReceiver* aReceiver, JSObject* scriptObject = nsnull; + // strong ref to a GC root we'll need to protect scriptObject in the case + // where it is not the global object (!winRoot). + nsCOMPtr wrapper; + if (winRoot) { scriptObject = boundGlobal->GetGlobalJSObject(); } else { @@ -411,9 +415,6 @@ nsXBLPrototypeHandler::ExecuteHandler(nsIDOMEventReceiver* aReceiver, nsCOMPtr xpc(do_GetService(nsIXPConnect::GetCID(), &rv)); - // root - nsCOMPtr wrapper; - // XXX: Don't use the global object! rv = xpc->WrapNative(cx, global, aReceiver, NS_GET_IID(nsISupports), getter_AddRefs(wrapper));