src: ensure that SetImmediate()s have HandleScopes

Make sure that all native `SetImmediate()` functions have `HandleScope`s if they create handles. PR-URL: #19470 Reviewed-By: Colin Ihrig <[email protected]> Reviewed-By: Tiancheng "Timothy" Gu <[email protected]> Reviewed-By: James M Snell <[email protected]> Reviewed-By: Tobias Nießen <[email protected]>
nodejs · Mar 25, 2018 · 2d94f77 · 2d94f77
1 parent e8c2917
commit 2d94f77
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 0 deletions.
diff --git a/src/env.cc b/src/env.cc
@@ -376,6 +376,9 @@ void Environment::RunAndClearNativeImmediates() {
     auto drain_list = [&]() {
       v8::TryCatch try_catch(isolate());
       for (auto it = list.begin(); it != list.end(); ++it) {
+#ifdef DEBUG
+        v8::SealHandleScope seal_handle_scope(isolate());
+#endif
         it->cb_(this, it->data_);
         if (it->refed_)
           ref_count++;

diff --git a/src/node_file.cc b/src/node_file.cc
@@ -178,6 +178,7 @@ inline void FileHandle::Close() {
       // it is being thrown from within the SetImmediate handler and
       // there is no JS stack to bubble it to. In other words, tearing
       // down the process is the only reasonable thing we can do here.
+      HandleScope handle_scope(env->isolate());
       env->ThrowUVException(detail->ret, "close", msg);
       delete detail;
     }, detail);

diff --git a/src/node_http2.cc b/src/node_http2.cc
@@ -520,6 +520,7 @@ void Http2Stream::EmitStatistics() {
         static_cast<Http2StreamPerformanceEntry*>(data) };
     if (!HasHttp2Observer(env))
       return;
+    HandleScope handle_scope(env->isolate());
     AliasedBuffer<double, v8::Float64Array>& buffer =
         env->http2_state()->stream_stats_buffer;
     buffer[IDX_STREAM_STATS_ID] = entry->id();
@@ -558,6 +559,7 @@ void Http2Session::EmitStatistics() {
         static_cast<Http2SessionPerformanceEntry*>(data) };
     if (!HasHttp2Observer(env))
       return;
+    HandleScope handle_scope(env->isolate());
     AliasedBuffer<double, v8::Float64Array>& buffer =
         env->http2_state()->session_stats_buffer;
     buffer[IDX_SESSION_STATS_TYPE] = entry->type();