1 files changed, 91 insertions, 0 deletions
diff --git a/js/src/jsapi-tests/testBug604087.cpp b/js/src/jsapi-tests/testBug604087.cpp
new file mode 100644
index 0000000000..a237a58a19
--- /dev/null
+++ b/js/src/jsapi-tests/testBug604087.cpp
@@ -0,0 +1,91 @@
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+ * vim: set ts=8 sts=2 et sw=2 tw=80:
+ *
+ * Tests JS_TransplantObject
+ */
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+#include "js/friend/WindowProxy.h"  // js::SetWindowProxyClass
+#include "js/GlobalObject.h"        // JS_NewGlobalObject
+#include "js/Wrapper.h"
+#include "js/WrapperCallbacks.h"
+#include "jsapi-tests/tests.h"
+#include "vm/JSObject.h"
+#include "vm/ProxyObject.h"
+
+const JSClass OuterWrapperClass = PROXY_CLASS_DEF(
+    "Proxy", JSCLASS_HAS_RESERVED_SLOTS(1) /* additional class flags */);
+
+static JSObject* wrap(JSContext* cx, JS::HandleObject toWrap,
+                      JS::HandleObject target) {
+  JSAutoRealm ar(cx, target);
+  JS::RootedObject wrapper(cx, toWrap);
+  if (!JS_WrapObject(cx, &wrapper)) {
+    return nullptr;
+  }
+  return wrapper;
+}
+
+static void PreWrap(JSContext* cx, JS::HandleObject scope,
+                    JS::HandleObject origObj, JS::HandleObject obj,
+                    JS::HandleObject objectPassedToWrap,
+                    JS::MutableHandleObject retObj) {
+  JS_GC(cx);
+  retObj.set(obj);
+}
+
+static JSObject* Wrap(JSContext* cx, JS::HandleObject existing,
+                      JS::HandleObject obj) {
+  return js::Wrapper::New(cx, obj, &js::CrossCompartmentWrapper::singleton);
+}
+
+static const JSWrapObjectCallbacks WrapObjectCallbacks = {Wrap, PreWrap};
+
+BEGIN_TEST(testBug604087) {
+  js::SetWindowProxyClass(cx, &OuterWrapperClass);
+
+  js::WrapperOptions options;
+  options.setClass(&OuterWrapperClass);
+  JS::RootedObject outerObj(
+      cx, js::Wrapper::New(cx, global, &js::Wrapper::singleton, options));
+  JS::RealmOptions globalOptions;
+  JS::RootedObject compartment2(
+      cx, JS_NewGlobalObject(cx, getGlobalClass(), nullptr,
+                             JS::FireOnNewGlobalHook, globalOptions));
+  CHECK(compartment2 != nullptr);
+  JS::RootedObject compartment3(
+      cx, JS_NewGlobalObject(cx, getGlobalClass(), nullptr,
+                             JS::FireOnNewGlobalHook, globalOptions));
+  CHECK(compartment3 != nullptr);
+  JS::RootedObject compartment4(
+      cx, JS_NewGlobalObject(cx, getGlobalClass(), nullptr,
+                             JS::FireOnNewGlobalHook, globalOptions));
+  CHECK(compartment4 != nullptr);
+
+  JS::RootedObject c2wrapper(cx, wrap(cx, outerObj, compartment2));
+  CHECK(c2wrapper);
+  c2wrapper->as<js::ProxyObject>().setReservedSlot(0, js::Int32Value(2));
+
+  JS::RootedObject c3wrapper(cx, wrap(cx, outerObj, compartment3));
+  CHECK(c3wrapper);
+  c3wrapper->as<js::ProxyObject>().setReservedSlot(0, js::Int32Value(3));
+
+  JS::RootedObject c4wrapper(cx, wrap(cx, outerObj, compartment4));
+  CHECK(c4wrapper);
+  c4wrapper->as<js::ProxyObject>().setReservedSlot(0, js::Int32Value(4));
+  compartment4 = c4wrapper = nullptr;
+
+  JS::RootedObject next(cx);
+  {
+    JSAutoRealm ar(cx, compartment2);
+    next = js::Wrapper::New(cx, compartment2, &js::Wrapper::singleton, options);
+    CHECK(next);
+  }
+
+  JS_SetWrapObjectCallbacks(cx, &WrapObjectCallbacks);
+  CHECK(JS_TransplantObject(cx, outerObj, next));
+  return true;
+}
+END_TEST(testBug604087)