Verified Commit 9bd17e3d authored by Edgar Chen's avatar Edgar Chen Committed by ma1
Browse files

Bug 2025346 - Create RemoteObjectProxy properly; r=smaug

parent 837b9c77
Loading
Loading
Loading
Loading
+1 −2
Original line number Diff line number Diff line
@@ -156,6 +156,7 @@ void RemoteObjectProxyBase::GetOrCreateProxyObject(
    MOZ_RELEASE_ASSERT(!aTransplantTo, "GOCPO failed at NewProxyObject");
    return;
  }
  aNewObjectCreated = true;

  bool success;
  if (!JS_SetImmutablePrototype(aCx, obj, &success)) {
@@ -165,8 +166,6 @@ void RemoteObjectProxyBase::GetOrCreateProxyObject(
  }
  MOZ_ASSERT(success);

  aNewObjectCreated = true;

  // If we're transplanting onto an object, we want to make sure that it does
  // not have the same class as aClasp to ensure that the release assert earlier
  // in this function will actually fire if we try to return a proxy object in