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 | dc33e920701244600a0cca1d60deb7621288bb5b (patch) | |
| tree | 201798e083d8869dd38af1de10552fe473064196 /dom | |
| parent | bd0e550e63c646dc5c515caf52aedad8bc29f9bd (diff) | |
| download | UXP-dc33e920701244600a0cca1d60deb7621288bb5b.tar UXP-dc33e920701244600a0cca1d60deb7621288bb5b.tar.gz UXP-dc33e920701244600a0cca1d60deb7621288bb5b.tar.lz UXP-dc33e920701244600a0cca1d60deb7621288bb5b.tar.xz UXP-dc33e920701244600a0cca1d60deb7621288bb5b.zip | |
Bug 1450688. r=bz, a=RyanVM
MozReview-Commit-ID: 4KHNpxiziWd
--HG--
extra : source : 008cc230b68fa2bf349923159b4a6e07768e56e5
extra : intermediate-source : 983ff6a90aae872383d52d5189396a47f3db7d17
Diffstat (limited to 'dom')
| -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; } |