url: fix array overrun in node:url::SetArgs()

PR-URL: #47001 Backport-PR-URL: #48345 Reviewed-By: Tiancheng "Timothy" Gu <[email protected]> Reviewed-By: Ben Noordhuis <[email protected]> Reviewed-By: Darshan Sen <[email protected]>
nodejs · Jul 12, 2023 · 977a8ba · 977a8ba
1 parent 4784e64
commit 977a8ba
Showing 1 changed file with 17 additions and 41 deletions.
diff --git a/src/node_url.cc b/src/node_url.cc
@@ -20,7 +20,6 @@ using v8::Local;
 using v8::NewStringType;
 using v8::Object;
 using v8::String;
-using v8::Undefined;
 using v8::Value;
 
 Local<String> Utf8String(Isolate* isolate, const std::string& str) {
@@ -46,18 +45,20 @@ enum url_update_action {
   kHref = 9,
 };
 
-void SetArgs(Environment* env, Local<Value> argv[10], const ada::result& url) {
+void SetArgs(Environment* env,
+             Local<Value> (*argv)[10],
+             const ada::result& url) {
   Isolate* isolate = env->isolate();
-  argv[0] = Utf8String(isolate, url->get_href());
-  argv[1] = Utf8String(isolate, url->get_origin());
-  argv[2] = Utf8String(isolate, url->get_protocol());
-  argv[3] = Utf8String(isolate, url->get_hostname());
-  argv[4] = Utf8String(isolate, url->get_pathname());
-  argv[5] = Utf8String(isolate, url->get_search());
-  argv[6] = Utf8String(isolate, url->get_username());
-  argv[7] = Utf8String(isolate, url->get_password());
-  argv[8] = Utf8String(isolate, url->get_port());
-  argv[9] = Utf8String(isolate, url->get_hash());
+  (*argv)[0] = Utf8String(isolate, url->get_href());
+  (*argv)[1] = Utf8String(isolate, url->get_origin());
+  (*argv)[2] = Utf8String(isolate, url->get_protocol());
+  (*argv)[3] = Utf8String(isolate, url->get_hostname());
+  (*argv)[4] = Utf8String(isolate, url->get_pathname());
+  (*argv)[5] = Utf8String(isolate, url->get_search());
+  (*argv)[6] = Utf8String(isolate, url->get_username());
+  (*argv)[7] = Utf8String(isolate, url->get_password());
+  (*argv)[8] = Utf8String(isolate, url->get_port());
+  (*argv)[9] = Utf8String(isolate, url->get_hash());
 }
 
 void Parse(const FunctionCallbackInfo<Value>& args) {
@@ -69,7 +70,6 @@ void Parse(const FunctionCallbackInfo<Value>& args) {
   Local<Function> success_callback_ = args[2].As<Function>();
 
   Environment* env = Environment::GetCurrent(args);
-  Isolate* isolate = env->isolate();
   HandleScope handle_scope(env->isolate());
   Context::Scope context_scope(env->context());
 
@@ -89,20 +89,8 @@ void Parse(const FunctionCallbackInfo<Value>& args) {
     return args.GetReturnValue().Set(false);
   }
 
-  const Local<Value> undef = Undefined(isolate);
-  Local<Value> argv[] = {
-      undef,
-      undef,
-      undef,
-      undef,
-      undef,
-      undef,
-      undef,
-      undef,
-      undef,
-      undef,
-  };
-  SetArgs(env, argv, out);
+  Local<Value> argv[10];
+  SetArgs(env, &argv, out);
   USE(success_callback_->Call(
       env->context(), args.This(), arraysize(argv), argv));
   args.GetReturnValue().Set(true);
@@ -235,20 +223,8 @@ void UpdateUrl(const FunctionCallbackInfo<Value>& args) {
     }
   }
 
-  const Local<Value> undef = Undefined(isolate);
-  Local<Value> argv[] = {
-      undef,
-      undef,
-      undef,
-      undef,
-      undef,
-      undef,
-      undef,
-      undef,
-      undef,
-      undef,
-  };
-  SetArgs(env, argv, out);
+  Local<Value> argv[10];
+  SetArgs(env, &argv, out);
   USE(success_callback_->Call(
       env->context(), args.This(), arraysize(argv), argv));
   args.GetReturnValue().Set(result);