child_process: refactor string validation in exec and spawn

nodejs · Jan 9, 2025 · 446cf6a · 446cf6a
1 parent 52c7bb1
commit 446cf6a
Showing 1 changed file with 10 additions and 8 deletions.
diff --git a/lib/child_process.js b/lib/child_process.js
@@ -186,9 +186,6 @@ function _forkChild(fd, serializationMode) {
 }
 
 function normalizeExecArgs(command, options, callback) {
-  validateString(command, 'command');
-  validateArgumentNullCheck(command, 'command');
-
   if (typeof options === 'function') {
     callback = options;
     options = undefined;
@@ -535,12 +532,17 @@ function copyProcessEnvToEnv(env, name, optionEnv) {
   }
 }
 
-function normalizeSpawnArguments(file, args, options) {
-  validateString(file, 'file');
-  validateArgumentNullCheck(file, 'file');
+function validateStringParam(param, paramName) {
+  validateString(param, paramName);
+  validateArgumentNullCheck(param, paramName);
+
+  if (param.length === 0) {
+    throw new ERR_INVALID_ARG_VALUE(paramName, param, 'cannot be empty');
+  }
+}
 
-  if (file.length === 0)
-    throw new ERR_INVALID_ARG_VALUE('file', file, 'cannot be empty');
+function normalizeSpawnArguments(file, args, options) {
+  validateStringParam(file, 'file');
 
   if (ArrayIsArray(args)) {
     args = ArrayPrototypeSlice(args);