FazBrowse GitHub Viewer | Trending |
URL:
| Home
Tools: [Download Repo ZIP]   [Original HTTPS Page]

src: add missing TryCatch · nodejs/node@d9c47e9 · GitHub

/ node Public

Commit d9c47e9

Browse files
committed
src: add missing TryCatch
Otherwise re-entering V8 doesn't work as expected after exceptions were thrown. Refs: https://chromium-review.googlesource.com/c/v8/v8/+/5050065 Co-Authored-By: Toon Verwaest <verwaest@chromium.org> Co-Authored-By: deepak1556 <hop2deep@gmail.com> PR-URL: #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>
1 parent c22793d commit d9c47e9

4 files changed

Lines changed: 22 additions & 0 deletions

File tree

‎src/js_stream.cc‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@ using v8::Int32;
2020
using v8::Isolate;
2121
using v8::Local;
2222
using v8::Object;
23+
using v8::TryCatch;
2324
using v8::Value;
2425

2526

@@ -169,6 +170,8 @@ void JSStream::ReadBuffer(const FunctionCallbackInfo<Value>& args) {
169170
const char* data = buffer.data();
170171
int len = buffer.length();
171172

173+
TryCatch try_catch(args.GetIsolate());
174+
172175
// Repeatedly ask the stream's owner for memory, copy the data that we
173176
// just read from JS into those buffers and emit them as reads.
174177
while (len != 0) {
@@ -182,6 +185,10 @@ void JSStream::ReadBuffer(const FunctionCallbackInfo<Value>& args) {
182185
len -= static_cast<int>(avail);
183186
wrap->EmitRead(avail, buf);
184187
}
188+
189+
if (try_catch.HasCaught()) {
190+
try_catch.ReThrow();
191+
}
185192
}
186193

187194

‎src/node_contextify.cc‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -462,13 +462,16 @@ bool ContextifyContext::IsStillInitializing(const ContextifyContext* ctx) {
462462
void ContextifyContext::PropertyGetterCallback(
463463
Local<Name> property,
464464
const PropertyCallbackInfo<Value>& args) {
465+
Environment* env = Environment::GetCurrent(args);
465466
ContextifyContext* ctx = ContextifyContext::Get(args);
466467

467468
// Still initializing
468469
if (IsStillInitializing(ctx)) return;
469470

470471
Local<Context> context = ctx->context();
471472
Local<Object> sandbox = ctx->sandbox();
473+
474+
TryCatchScope try_catch(env);
472475
MaybeLocal<Value> maybe_rv =
473476
sandbox->GetRealNamedProperty(context, property);
474477
if (maybe_rv.IsEmpty()) {
@@ -478,6 +481,9 @@ void ContextifyContext::PropertyGetterCallback(
478481

479482
Local<Value> rv;
480483
if (maybe_rv.ToLocal(&rv)) {
484+
if (try_catch.HasCaught() && !try_catch.HasTerminated()) {
485+
try_catch.ReThrow();
486+
}
481487
if (rv == sandbox)
482488
rv = ctx->global_proxy();
483489

‎src/node_messaging.cc‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -916,6 +916,7 @@ Maybe<bool> MessagePort::PostMessage(Environment* env,
916916
const TransferList& transfer_v) {
917917
Isolate* isolate = env->isolate();
918918
Local<Object> obj = object(isolate);
919+
TryCatchScope try_catch(env);
919920

920921
std::shared_ptr<Message> msg = std::make_shared<Message>();
921922

@@ -924,6 +925,9 @@ Maybe<bool> MessagePort::PostMessage(Environment* env,
924925

925926
Maybe<bool> serialization_maybe =
926927
msg->Serialize(env, context, message_v, transfer_v, obj);
928+
if (try_catch.HasCaught() && !try_catch.HasTerminated()) {
929+
try_catch.ReThrow();
930+
}
927931
if (data_ == nullptr) {
928932
return serialization_maybe;
929933
}

‎test/addons/make-callback-recurse/binding.cc‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ using v8::FunctionCallbackInfo;
88
using v8::Isolate;
99
using v8::Local;
1010
using v8::Object;
11+
using v8::TryCatch;
1112
using v8::Value;
1213

1314
namespace {
@@ -19,8 +20,12 @@ void MakeCallback(const FunctionCallbackInfo<Value>& args) {
1920
Local<Object> recv = args[0].As<Object>();
2021
Local<Function> method = args[1].As<Function>();
2122

23+
TryCatch try_catch(isolate);
2224
node::MakeCallback(isolate, recv, method, 0, nullptr,
2325
node::async_context{0, 0});
26+
if (try_catch.HasCaught()) {
27+
try_catch.ReThrow();
28+
}
2429
}
2530

2631
void Initialize(Local<Object> exports) {

0 commit comments

Comments
 (0)
Back | FazBrowse Home | New Git URL