commit bfbab2b7a05871e82aa18ac2a61d14667d8b366e Author: Bobby Holley <bobbyholley@gmail.com> Date: Wed Apr 2 16:29:00 2014 -0300 Bug 989183 - Check for nsXBLJSClass on esr24. r=bz a=sledru --- content/xbl/src/nsXBLBinding.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/content/xbl/src/nsXBLBinding.cpp b/content/xbl/src/nsXBLBinding.cpp index 8b6133a6..9832a3c 100644 --- a/content/xbl/src/nsXBLBinding.cpp +++ b/content/xbl/src/nsXBLBinding.cpp @@ -1155,7 +1155,7 @@ nsXBLBinding::DoInitJSClass(JSContext *cx, JS::Handle<JSObject*> global, if (!::JS_LookupPropertyWithFlags(cx, global, className.get(), 0, val.address())) return NS_ERROR_OUT_OF_MEMORY; - if (val.isObject()) { + if (val.isObject() && JS_GetClass(&val.toObject())->finalize == XBLFinalize) { *aNew = false; proto = &val.toObject(); } else {