fixup: suggestion (manual check)

Author: addaleax

src/node_sqlite.cc

@@ -2273,6 +2273,7 @@ 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));

src/node_url_pattern.cc

@@ -440,37 +440,18 @@ MaybeLocal<Value> URLPattern::URLPatternResult::ToJSValue(
  return {};
  }
 
- Local<Object> results[8];
- if (!URLPatternComponentResult::ToJSObject(env, result.protocol)
- .ToLocal(&results[0]) ||
- !URLPatternComponentResult::ToJSObject(env, result.username)
- .ToLocal(&results[1]) ||
- !URLPatternComponentResult::ToJSObject(env, result.password)
- .ToLocal(&results[2]) ||
- !URLPatternComponentResult::ToJSObject(env, result.hostname)
- .ToLocal(&results[3]) ||
- !URLPatternComponentResult::ToJSObject(env, result.port)
- .ToLocal(&results[4]) ||
- !URLPatternComponentResult::ToJSObject(env, result.pathname)
- .ToLocal(&results[5]) ||
- !URLPatternComponentResult::ToJSObject(env, result.search)
- .ToLocal(&results[6]) ||
- !URLPatternComponentResult::ToJSObject(env, result.hash)
- .ToLocal(&results[7])) {
- return {};
- }
-
  MaybeLocal<Value> vals[] = {
  inputs,
- results[0], /** protocol */
- results[1], /** username */
- results[2], /** password */
- results[3], /** hostname */
- results[4], /** port */
- results[5], /** pathname */
- results[6], /** search */
- results[7], /** hash */
+ URLPatternComponentResult::ToJSObject(env, result.protocol),
+ URLPatternComponentResult::ToJSObject(env, result.username),
+ URLPatternComponentResult::ToJSObject(env, result.password),
+ URLPatternComponentResult::ToJSObject(env, result.hostname),
+ URLPatternComponentResult::ToJSObject(env, result.port),
+ URLPatternComponentResult::ToJSObject(env, result.pathname),
+ URLPatternComponentResult::ToJSObject(env, result.search),
+ URLPatternComponentResult::ToJSObject(env, result.hash),
  };
+ if (IsAnyEntryEmpty(vals)) return {};
  return tmpl->NewInstance(env->context(), vals);
 }
 

src/node_util.cc

@@ -305,6 +305,7 @@ 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));
  }

src/util.h

@@ -1033,6 +1033,14 @@ class JSONOutputStream final : public v8::OutputStream {
  std::ostringstream out_stream_;
 };
 
+template <typename T>
+inline bool IsAnyEntryEmpty(const T& t) {
+ for (const auto& e : t) {
+ if (e.IsEmpty()) return true;
+ }
+ return false;
+}
+
 #ifdef _WIN32
 // Returns true if OS==Windows and filename ends in .bat or .cmd,
 // case insensitive.