archive/node
1
0
Fork 0
mirror of https://github.com/nodejs/node.git synced 2025-08-15 13:48:44 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

src: add missing TryCatch

Browse source 
Otherwise re-entering V8 doesn't work as expected after exceptions
were thrown.

Refs: 5050065

Co-Authored-By: Toon Verwaest <verwaest@chromium.org>
Co-Authored-By: deepak1556 <hop2deep@gmail.com>
PR-URL: https://github.com/nodejs/node/pull/51362
Reviewed-By: Matteo Collina <matteo.collina@gmail.com>
Reviewed-By: Antoine du Hamel <duhamelantoine1995@gmail.com>
Reviewed-By: Rafael Gonzaga <rafael.nunu@hotmail.com>
This commit is contained in:
Michaël Zasso 2024-01-07 15:02:32 +01:00
parent c22793d050
commit d9c47e9b5f
No known key found for this signature in database
GPG key ID: 770F7A9A5AE15600
4 changed files with 22 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

7
src/js_stream.cc
View file

@ -20,6 +20,7 @@ using v8::Int32;
using v8::Isolate;
using v8::Local;
using v8::Object;
using v8::TryCatch;
using v8::Value;
@ -169,6 +170,8 @@ void JSStream::ReadBuffer(const FunctionCallbackInfo<Value>& args) {
const char* data = buffer.data();
int len = buffer.length();
TryCatch try_catch(args.GetIsolate());
// Repeatedly ask the stream's owner for memory, copy the data that we
// just read from JS into those buffers and emit them as reads.
while (len != 0) {
@ -182,6 +185,10 @@ void JSStream::ReadBuffer(const FunctionCallbackInfo<Value>& args) {
len -= static_cast<int>(avail);
wrap->EmitRead(avail, buf);
}
if (try_catch.HasCaught()) {
try_catch.ReThrow();
}
}

6
src/node_contextify.cc
View file

@ -462,6 +462,7 @@ bool ContextifyContext::IsStillInitializing(const ContextifyContext* ctx) {
void ContextifyContext::PropertyGetterCallback(
Local<Name> property,
const PropertyCallbackInfo<Value>& args) {
Environment* env = Environment::GetCurrent(args);
ContextifyContext* ctx = ContextifyContext::Get(args);
// Still initializing
@ -469,6 +470,8 @@ void ContextifyContext::PropertyGetterCallback(
Local<Context> context = ctx->context();
Local<Object> sandbox = ctx->sandbox();
TryCatchScope try_catch(env);
MaybeLocal<Value> maybe_rv =
sandbox->GetRealNamedProperty(context, property);
if (maybe_rv.IsEmpty()) {
@ -478,6 +481,9 @@ void ContextifyContext::PropertyGetterCallback(
Local<Value> rv;
if (maybe_rv.ToLocal(&rv)) {
if (try_catch.HasCaught() && !try_catch.HasTerminated()) {
try_catch.ReThrow();
}
if (rv == sandbox)
rv = ctx->global_proxy();

4
src/node_messaging.cc
View file

@ -916,6 +916,7 @@ Maybe<bool> MessagePort::PostMessage(Environment* env,
const TransferList& transfer_v) {
Isolate* isolate = env->isolate();
Local<Object> obj = object(isolate);
TryCatchScope try_catch(env);
std::shared_ptr<Message> msg = std::make_shared<Message>();
@ -924,6 +925,9 @@ Maybe<bool> MessagePort::PostMessage(Environment* env,
Maybe<bool> serialization_maybe =
msg->Serialize(env, context, message_v, transfer_v, obj);
if (try_catch.HasCaught() && !try_catch.HasTerminated()) {
try_catch.ReThrow();
}
if (data_ == nullptr) {
return serialization_maybe;
}

5
test/addons/make-callback-recurse/binding.cc
View file

@ -8,6 +8,7 @@ using v8::FunctionCallbackInfo;
using v8::Isolate;
using v8::Local;
using v8::Object;
using v8::TryCatch;
using v8::Value;
namespace {
@ -19,8 +20,12 @@ void MakeCallback(const FunctionCallbackInfo<Value>& args) {
Local<Object> recv = args[0].As<Object>();
Local<Function> method = args[1].As<Function>();
TryCatch try_catch(isolate);
node::MakeCallback(isolate, recv, method, 0, nullptr,
node::async_context{0, 0});
if (try_catch.HasCaught()) {
try_catch.ReThrow();
}
}
void Initialize(Local<Object> exports) {