OSSForks/node
1
0
Fork 0
mirror of https://github.com/zebrajr/node.git synced 2026-01-15 12:15:26 +00:00
Code Issues Actions 8 Packages Projects Releases Wiki Activity

src: improve error handing in node_messaging

Browse Source 
PR-URL: https://github.com/nodejs/node/pull/57760
Reviewed-By: Michaël Zasso <targos@protonmail.com>
Reviewed-By: Yagiz Nizipli <yagiz@nizipli.com>
This commit is contained in:
James M Snell
2025-04-05 11:07:52 -07:00
parent 588770630d
commit e06a2ad21f
1 changed files with 22 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
src/node_messaging.cc
View File

@@ -491,8 +491,12 @@ Maybe<bool> Message::Serialize(Environment* env,
Local<Object> entry = entry_val.As<Object>();
// See https://github.com/nodejs/node/pull/30339#issuecomment-552225353
// for details.
if (entry->HasPrivate(context, env->untransferable_object_private_symbol())
.ToChecked()) {
bool ans;
if (!entry->HasPrivate(context, env->untransferable_object_private_symbol())
.To(&ans)) {
return Nothing<bool>();
}
if (ans) {
ThrowDataCloneException(context, env->transfer_unsupported_type_str());
return Nothing<bool>();
}
@@ -591,7 +595,9 @@ Maybe<bool> Message::Serialize(Environment* env,
for (Local<ArrayBuffer> ab : array_buffers) {
// If serialization succeeded, we render it inaccessible in this Isolate.
std::shared_ptr<BackingStore> backing_store = ab->GetBackingStore();
ab->Detach(Local<Value>()).Check();
if (ab->Detach(Local<Value>()).IsNothing()) {
return Nothing<bool>();
}
array_buffers_.emplace_back(std::move(backing_store));
}
@@ -1073,7 +1079,10 @@ bool GetTransferList(Environment* env,
void MessagePort::PostMessage(const FunctionCallbackInfo<Value>& args) {
Environment* env = Environment::GetCurrent(args);
Local<Object> obj = args.This();
Local<Context> context = obj->GetCreationContextChecked();
Local<Context> context;
if (!obj->GetCreationContext().ToLocal(&context)) {
return;
}
if (args.Length() == 0) {
return THROW_ERR_MISSING_ARGS(env, "Not enough arguments to "
@@ -1160,8 +1169,11 @@ void MessagePort::ReceiveMessage(const FunctionCallbackInfo<Value>& args) {
}
Local<Value> payload;
if (port->ReceiveMessage(port->object()->GetCreationContextChecked(),
MessageProcessingMode::kForceReadMessages)
Local<Context> context;
if (!port->object()->GetCreationContext().ToLocal(&context)) {
return;
}
if (port->ReceiveMessage(context, MessageProcessingMode::kForceReadMessages)
.ToLocal(&payload)) {
args.GetReturnValue().Set(payload);
}
@@ -1619,7 +1631,10 @@ static void MessageChannel(const FunctionCallbackInfo<Value>& args) {
return;
}
Local<Context> context = args.This()->GetCreationContextChecked();
Local<Context> context;
if (!args.This()->GetCreationContext().ToLocal(&context)) {
return;
}
Context::Scope context_scope(context);
MessagePort* port1 = MessagePort::New(env, context);