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));