src: do not run IsWindowsBatchFile on non-windows

PR-URL: #55560 Reviewed-By: Richard Lau <[email protected]> Reviewed-By: Stefan Stojanovic <[email protected]>
nodejs · Oct 29, 2024 · e160e54 · e160e54
1 parent ece37bc
commit e160e54
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 17 deletions.
diff --git a/src/process_wrap.cc b/src/process_wrap.cc
@@ -200,8 +200,10 @@ class ProcessWrap : public HandleWrap {
     // batch files directly but is potentially insecure because arguments
     // are not escaped (and sometimes cannot be unambiguously escaped),
     // hence why they are rejected here.
+#ifdef _WIN32
     if (IsWindowsBatchFile(options.file))
       err = UV_EINVAL;
+#endif
 
     // options.args
     Local<Value> argv_v =

diff --git a/src/spawn_sync.cc b/src/spawn_sync.cc
@@ -769,8 +769,10 @@ Maybe<int> SyncProcessRunner::ParseOptions(Local<Value> js_value) {
   // batch files directly but is potentially insecure because arguments
   // are not escaped (and sometimes cannot be unambiguously escaped),
   // hence why they are rejected here.
+#ifdef _WIN32
   if (IsWindowsBatchFile(uv_process_options_.file))
     return Just<int>(UV_EINVAL);
+#endif
 
   Local<Value> js_args =
       js_options->Get(context, env()->args_string()).ToLocalChecked();

diff --git a/src/util-inl.h b/src/util-inl.h
@@ -540,25 +540,21 @@ constexpr std::string_view FastStringKey::as_string_view() const {
 // Inline so the compiler can fully optimize it away on Unix platforms.
 bool IsWindowsBatchFile(const char* filename) {
 #ifdef _WIN32
-  static constexpr bool kIsWindows = true;
-#else
-  static constexpr bool kIsWindows = false;
-#endif  // _WIN32
-  if (kIsWindows) {
-    std::string file_with_extension = filename;
-    // Regex to match the last extension part after the last dot, ignoring
-    // trailing spaces and dots
-    std::regex extension_regex(R"(\.([a-zA-Z0-9]+)\s*[\.\s]*$)");
-    std::smatch match;
-    std::string extension;
-
-    if (std::regex_search(file_with_extension, match, extension_regex)) {
-      extension = ToLower(match[1].str());
-    }
-
-    return !extension.empty() && (extension == "cmd" || extension == "bat");
+  std::string file_with_extension = filename;
+  // Regex to match the last extension part after the last dot, ignoring
+  // trailing spaces and dots
+  std::regex extension_regex(R"(\.([a-zA-Z0-9]+)\s*[\.\s]*$)");
+  std::smatch match;
+  std::string extension;
+
+  if (std::regex_search(file_with_extension, match, extension_regex)) {
+    extension = ToLower(match[1].str());
   }
+
+  return !extension.empty() && (extension == "cmd" || extension == "bat");
+#else
   return false;
+#endif  // _WIN32
 }
 
 }  // namespace node