From dc33e920701244600a0cca1d60deb7621288bb5b Mon Sep 17 00:00:00 2001 From: Kris Maglione Date: Tue, 15 May 2018 16:01:36 -0700 Subject: Bug 1450688. r=bz, a=RyanVM MozReview-Commit-ID: 4KHNpxiziWd --HG-- extra : source : 008cc230b68fa2bf349923159b4a6e07768e56e5 extra : intermediate-source : 983ff6a90aae872383d52d5189396a47f3db7d17 --- dom/xbl/nsXBLBinding.cpp | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) (limited to 'dom/xbl/nsXBLBinding.cpp') diff --git a/dom/xbl/nsXBLBinding.cpp b/dom/xbl/nsXBLBinding.cpp index 6ae17c4c0..d9a2aacc5 100644 --- a/dom/xbl/nsXBLBinding.cpp +++ b/dom/xbl/nsXBLBinding.cpp @@ -1014,7 +1014,17 @@ nsXBLBinding::DoInitJSClass(JSContext *cx, NS_ENSURE_TRUE(xblScope, NS_ERROR_UNEXPECTED); JS::Rooted parent_proto(cx); - if (!JS_GetPrototype(cx, obj, &parent_proto)) { + { + JS::RootedObject wrapped(cx, obj); + JSAutoCompartment ac(cx, xblScope); + if (!JS_WrapObject(cx, &wrapped)) { + return NS_ERROR_FAILURE; + } + if (!JS_GetPrototype(cx, wrapped, &parent_proto)) { + return NS_ERROR_FAILURE; + } + } + if (!JS_WrapObject(cx, &parent_proto)) { return NS_ERROR_FAILURE; } -- cgit v1.2.3