fixup: suggestion (wrapper with check)

Author: addaleax

src/node_sqlite.cc

@@ -2273,10 +2273,14 @@ void StatementSync::Columns(const FunctionCallbackInfo<Value>& args) {
         NullableSQLiteStringToValue(
             isolate, sqlite3_column_decltype(stmt->statement_, i)),
     };
-    if (IsAnyEntryEmpty(values)) return;
 
-    cols.emplace_back(
-        sqlite_column_template->NewInstance(env->context(), values));
+    Local<Object> values_obj;
+    if (!CheckedDictionaryInstance(
+             sqlite_column_template, env->context(), values)
+             .ToLocal(&values_obj)) {
+      return;
+    }
+    cols.emplace_back(values_obj);
   }
 
   args.GetReturnValue().Set(Array::New(isolate, cols.data(), cols.size()));

src/node_url_pattern.cc

@@ -451,8 +451,7 @@ MaybeLocal<Value> URLPattern::URLPatternResult::ToJSValue(
       URLPatternComponentResult::ToJSObject(env, result.search),
       URLPatternComponentResult::ToJSObject(env, result.hash),
   };
-  if (IsAnyEntryEmpty(vals)) return {};
-  return tmpl->NewInstance(env->context(), vals);
+  return CheckedDictionaryInstance(tmpl, env->context(), vals);
 }
 
 std::optional<ada::url_pattern_options>

src/node_util.cc

@@ -305,9 +305,12 @@ static void GetCallSites(const FunctionCallbackInfo<Value>& args) {
         Integer::NewFromUnsigned(isolate, stack_frame->GetColumn()),
     };
 
-    if (IsAnyEntryEmpty(values)) return;
-    callsite_objects.push_back(
-        callsite_template->NewInstance(env->context(), values));
+    Local<Object> callsite_object;
+    if (!CheckedDictionaryInstance(callsite_template, env->context(), values)
+             .ToLocal(&callsite_object)) {
+      return;
+    }
+    callsite_objects.emplace_back(callsite_object);
   }
 
   Local<Array> callsites =

src/node_v8.cc

@@ -401,8 +401,12 @@ static MaybeLocal<Object> ConvertHeapStatsToJSObject(
                 isolate, static_cast<uint32_t>(object_stats.allocated_bytes)),
             Uint32::NewFromUnsigned(
                 isolate, static_cast<uint32_t>(object_stats.object_count))};
-        Local<Object> object_stats_object =
-            object_stats_template->NewInstance(context, object_stats_values);
+        Local<Object> object_stats_object;
+        if (!CheckedDictionaryInstance(
+                 object_stats_template, context, object_stats_values)
+                 .ToLocal(&object_stats_object)) {
+          return {};
+        }
         object_statistics_array.emplace_back(object_stats_object);
       }
 
@@ -417,8 +421,12 @@ static MaybeLocal<Object> ConvertHeapStatsToJSObject(
           Array::New(isolate,
                      object_statistics_array.data(),
                      object_statistics_array.size())};
-      page_statistics_array.emplace_back(
-          page_stats_tmpl->NewInstance(context, page_stats_values));
+      Local<Object> page_stats_object;
+      if (!CheckedDictionaryInstance(
+               page_stats_tmpl, context, page_stats_values)
+               .ToLocal(&page_stats_object)) {
+        return {};
+      }
     }
 
     // Free List Statistics
@@ -456,8 +464,13 @@ static MaybeLocal<Object> ConvertHeapStatsToJSObject(
                    page_statistics_array.size()),
         free_list_statistics_obj,
     };
-    space_statistics_array.emplace_back(
-        space_stats_tmpl->NewInstance(context, space_stats_values));
+    Local<Object> space_stats_object;
+    if (!CheckedDictionaryInstance(
+             space_stats_tmpl, context, space_stats_values)
+             .ToLocal(&space_stats_object)) {
+      return {};
+    }
+    space_statistics_array.emplace_back(space_stats_object);
   }
 
   Local<Value> type_names_value;
@@ -476,8 +489,8 @@ static MaybeLocal<Object> ConvertHeapStatsToJSObject(
                  space_statistics_array.data(),
                  space_statistics_array.size()),
       type_names_value};
-
-  return heap_stats_tmpl->NewInstance(context, heap_statistics_values);
+  return CheckedDictionaryInstance(
+      heap_stats_tmpl, context, heap_statistics_values);
 }
 
 static void GetCppHeapStatistics(const FunctionCallbackInfo<Value>& args) {

src/node_worker.cc

@@ -1117,8 +1117,14 @@ void Worker::GetHeapStatistics(const FunctionCallbackInfo<Value>& args) {
               Number::New(isolate, heap_stats->used_global_handles_size()),
               Number::New(isolate, heap_stats->external_memory())};
 
-          Local<Value> args[] = {
-              tmpl->NewInstance(env->context(), heap_stats_values)};
+          Local<Object> heap_stats_object;
+          if (!CheckedDictionaryInstance(
+                   tmpl, env->context(), heap_stats_values)
+                   .ToLocal(&heap_stats_object)) {
+            return;
+          }
+
+          Local<Value> args[] = {heap_stats_object};
           taker->get()->MakeCallback(
               env->ondone_string(), arraysize(args), args);
           // implicitly delete `taker`

src/util.h

@@ -1041,6 +1041,14 @@ inline bool IsAnyEntryEmpty(const T& t) {
   return false;
 }
 
+inline v8::MaybeLocal<v8::Object> CheckedDictionaryInstance(
+    v8::Local<v8::DictionaryTemplate> tmpl,
+    v8::Local<v8::Context> context,
+    v8::MemorySpan<v8::MaybeLocal<v8::Value>> property_values) {
+  if (IsAnyEntryEmpty(property_values)) return {};
+  return tmpl->NewInstance(context, property_values);
+}
+
 #ifdef _WIN32
 // Returns true if OS==Windows and filename ends in .bat or .cmd,
 // case insensitive.