diff options
| author | Kris Maglione <maglione.k@gmail.com> | 2018-05-15 16:01:36 -0700 |
|---|---|---|
| committer | wolfbeast <mcwerewolf@gmail.com> | 2018-06-07 06:23:01 +0200 |
| commit | 6d460857d92c4c4e52963f6f810de13aea685639 (patch) | |
| tree | 201798e083d8869dd38af1de10552fe473064196 | |
| parent | f13090c22379340f4e442d33d8a7e6adcea283f1 (diff) | |
| download | aura-central-6d460857d92c4c4e52963f6f810de13aea685639.tar.gz | |
Bug 1450688. r=bz, a=RyanVM
MozReview-Commit-ID: 4KHNpxiziWd
--HG--
extra : source : 008cc230b68fa2bf349923159b4a6e07768e56e5
extra : intermediate-source : 983ff6a90aae872383d52d5189396a47f3db7d17
| -rw-r--r-- | dom/xbl/nsXBLBinding.cpp | 12 |
1 files changed, 11 insertions, 1 deletions
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<JSObject*> 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; } |