src: simplify MessagePort construction code a bit

Using `ASSIGN_OR_RETURN_UNWRAP` would return if the created `MessagePort` object had no internal fields. That would be a bug, so switch to a checked conversion instead. PR-URL: #23036 Reviewed-By: Gus Caplan <[email protected]> Reviewed-By: James M Snell <[email protected]> Reviewed-By: Colin Ihrig <[email protected]> Reviewed-By: Joyee Cheung <[email protected]>
nodejs · Sep 27, 2018 · f3d09b6 · f3d09b6
1 parent 4d61c34
commit f3d09b6
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/src/node_messaging.cc b/src/node_messaging.cc
@@ -483,14 +483,14 @@ MessagePort* MessagePort::New(
   Local<Function> ctor;
   if (!GetMessagePortConstructor(env, context).ToLocal(&ctor))
     return nullptr;
-  MessagePort* port = nullptr;
 
   // Construct a new instance, then assign the listener instance and possibly
   // the MessagePortData to it.
   Local<Object> instance;
   if (!ctor->NewInstance(context).ToLocal(&instance))
     return nullptr;
-  ASSIGN_OR_RETURN_UNWRAP(&port, instance, nullptr);
+  MessagePort* port = Unwrap<MessagePort>(instance);
+  CHECK_NOT_NULL(port);
   if (data) {
     port->Detach();
     port->data_ = std::move(data);