Ensure executable paths are escaped on the Windows platform.

TEST=ci

Change-Id: Ia6688aaa11d6898b20c92eb3a3a5510213c26d67
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/439346
Commit-Queue: Siva Annamalai <[email protected]>
Reviewed-by: Jason Simmons <[email protected]>

Author: a-siva

runtime/bin/dartdev.cc

@@ -492,8 +492,8 @@ class DartDev {
   // Invoke the Dart VM directly bypassing dartdev.
   static void InvokeDartVM(int argc, char** argv, bool argv_converted) {
     auto dartvm_path = DartDev::ResolvedDartVmPath();
-    char* exec_name = dartvm_path.get();
-    if (exec_name == nullptr || !CheckForInvalidPath(exec_name)) {
+    if (dartvm_path.get() == nullptr ||
+        !CheckForInvalidPath(dartvm_path.get())) {
       // Free environment if any.
       Syslog::PrintErr("Unable to locate the Dart VM executable");
       Options::Cleanup();
@@ -504,12 +504,23 @@ class DartDev {
     err_msg[0] = '\0';
     intptr_t num_args = argc + 2;
     char** exec_argv = new char*[num_args];
-    exec_argv[idx] = Utils::StrDup(exec_name);
+#if defined(DART_HOST_OS_WINDOWS)
+    char* exec_name = StringUtilsWin::ArgumentEscape(dartvm_path.get());
+#else
+    char* exec_name = Utils::StrDup(dartvm_path.get());
+#endif
+    exec_argv[idx] = exec_name;
     const size_t kPathBufSize = PATH_MAX + 1;
     char dart_path[kPathBufSize];
     Platform::ResolveExecutablePathInto(dart_path, kPathBufSize);
     idx += 1;
+#if defined(DART_HOST_OS_WINDOWS)
+    char* dart_name = Utils::SCreate("--executable_name=%s", dart_path);
+    exec_argv[idx] = StringUtilsWin::ArgumentEscape(dart_name);
+    free(dart_name);
+#else
     exec_argv[idx] = Utils::SCreate("--executable_name=%s", dart_path);
+#endif
     for (intptr_t i = 1; i < argc; ++i) {
 #if defined(DART_HOST_OS_WINDOWS)
       exec_argv[i + idx] = StringUtilsWin::ArgumentEscape(argv[i]);
@@ -584,8 +595,8 @@ class DartDev {
   static void RunExecResultCallback(Dart_CObject* message) {
     result_ = DartDev_Result_RunExec;
     auto dartvm_path = DartDev::ResolvedDartVmPath();
-    char* exec_name = dartvm_path.get();
-    if (exec_name == nullptr || !CheckForInvalidPath(exec_name)) {
+    if (dartvm_path.get() == nullptr ||
+        !CheckForInvalidPath(dartvm_path.get())) {
       Syslog::PrintErr("Unable to locate the Dart VM executable");
       Platform::Exit(kErrorExitCode);
     }
@@ -629,7 +640,11 @@ class DartDev {
 
     intptr_t idx = 0;
     // Copy in name of the executable to run (should be the dart vm).
-    script_name_ = Utils::StrDup(exec_name);
+#if defined(DART_HOST_OS_WINDOWS)
+    script_name_ = StringUtilsWin::ArgumentEscape(dartvm_path.get());
+#else
+    script_name_ = Utils::StrDup(dartvm_path.get());
+#endif
     argv_[idx++] = script_name_;
     // Copy in VM options if any.
     // Copy in any vm options that need to be passed to the execed process.
@@ -641,7 +656,13 @@ class DartDev {
       const size_t kPathBufSize = PATH_MAX + 1;
       char dart_path[kPathBufSize];
       Platform::ResolveExecutablePathInto(dart_path, kPathBufSize);
+#if defined(DART_HOST_OS_WINDOWS)
+      char* dart_name = Utils::SCreate("--executable_name=%s", dart_path);
+      argv_[idx++] = StringUtilsWin::ArgumentEscape(dart_name);
+      free(dart_name);
+#else
       argv_[idx++] = Utils::SCreate("--executable_name=%s", dart_path);
+#endif
     }
     if (mark_main_isolate_as_system_isolate) {
       argv_[idx++] = Utils::StrDup("--mark_main_isolate_as_system_isolate");