fix win segv

Author: wiomoc

bazel/ocx/private/launcher/launcher.cc

@@ -2,10 +2,11 @@
 #include <string>
 #include <unordered_map>
 #include <cstring>
+#include <vector>
 #include "rules_cc/cc/runfiles/runfiles.h"
 
 #ifdef _WIN32
-#include <process.h>
+#include <Windows.h>
 #else
 #include <unistd.h>
 #endif
@@ -14,8 +15,7 @@ using rules_cc::cc::runfiles::Runfiles;
 
 const char* env_vars[] = ENV;
 
-
-static const char** build_merged_envp(char *envp[], const std::string& layer_dir)
+static std::vector<std::string> build_merged_envp(char *envp[], const std::string& layer_dir)
 {
     std::unordered_map<std::string, std::string> merged_env;
     for (char** env = envp; env && *env; ++env)
@@ -28,6 +28,9 @@ static const char** build_merged_envp(char *envp[], const std::string& layer_dir
         }
 
         std::string key = current.substr(0, separator);
+#ifdef _WIN32
+        for (auto& c : key) c = toupper((unsigned char)c);
+#endif
         merged_env[key] = current.substr(separator + 1);
     }
 
@@ -41,6 +44,9 @@ static const char** build_merged_envp(char *envp[], const std::string& layer_dir
         }
 
         std::string key = current.substr(0, separator);
+#ifdef _WIN32
+        for (auto& c : key) c = toupper((unsigned char)c);
+#endif
         std::string value = current.substr(separator + 1);
 
         // Replace ${installPath} with the actual layer directory path.
@@ -64,16 +70,12 @@ static const char** build_merged_envp(char *envp[], const std::string& layer_dir
     }
 
     // Convert the merged environment map back to an array of C strings.
-    const char** merged_envp = new const char*[merged_env.size() + 1];
-    size_t i = 0;
+    std::vector<std::string> merged_envp;
+    merged_envp.reserve(merged_env.size());
     for (auto& [key, value] : merged_env)
     {
-        std::string entry = key + "=" + value;
-        char* buffer = new char[entry.size() + 1];
-        memcpy(buffer, entry.c_str(), entry.size() + 1);
-        merged_envp[i++] = buffer;
+        merged_envp.push_back(key + "=" + value);
     }
-    merged_envp[i] = nullptr;
     return merged_envp;
 }
 
@@ -82,7 +84,6 @@ int main(int argc, char *argv[], char *envp[])
     (void)argc;
 
     std::string error;
-
     // Resolve the path to the executable in the runfiles structure
     auto runfiles = std::unique_ptr<Runfiles>(
         Runfiles::Create(argv[0], BAZEL_CURRENT_REPOSITORY, &error));
@@ -93,7 +94,6 @@ int main(int argc, char *argv[], char *envp[])
     }
     std::string bin_path = BIN_PATH;
     std::string path = runfiles->Rlocation(bin_path);
-
     // Resolve the image layer root directory in the runfiles structure
     auto layer_dir_pos =  bin_path.find("/layer/");
     if (layer_dir_pos == std::string::npos) {
@@ -102,19 +102,78 @@ int main(int argc, char *argv[], char *envp[])
     }
     auto bin_path_in_layer_length = bin_path.length() - layer_dir_pos - 7;
     std::string layer_dir = path.substr(0, path.length() - bin_path_in_layer_length);
-
-    const char** merged_envp = build_merged_envp(envp, layer_dir);
+    std::vector<std::string> merged_envp = build_merged_envp(envp, layer_dir);
 
 #ifdef _WIN32
-    int res = _execve(path.c_str(), argv, (char *const *)  merged_envp);
-#else
-    int res = execve(path.c_str(), argv, (char *const *) merged_envp);
-#endif
+    // Build command line
+    std::string cmdline = "\"" + path + "\"";
+    for (int i = 1; argv[i] != nullptr; ++i) {
+        cmdline += " \"";
+        cmdline += argv[i];
+        cmdline += "\"";
+    }
 
+    // Build environment block (double-null-terminated)
+    size_t env_block_len = 0;
+    for (const auto& env : merged_envp) {
+        env_block_len += env.size() + 1;
+    }
+    env_block_len += 1; // final null
+    char* env_block = new char[env_block_len];
+    char* p = env_block;
+    for (const auto& env : merged_envp) {
+        size_t len = env.size();
+        memcpy(p, env.c_str(), len);
+        p += len;
+        *p++ = '\0';
+    }
+    *p = '\0';
+
+    STARTUPINFOA si;
+    PROCESS_INFORMATION pi;
+    ZeroMemory(&si, sizeof(si));
+    si.cb = sizeof(si);
+    ZeroMemory(&pi, sizeof(pi));
+
+    BOOL success = CreateProcessA(
+        path.c_str(),
+        (LPSTR)cmdline.c_str(),
+        NULL,
+        NULL,
+        FALSE,
+        0,
+        env_block,
+        NULL,
+        &si,
+        &pi
+    );
+    if (!success) {
+        fprintf(stderr, "ERROR: failed to execute '%s' (CreateProcess failed)\n", path.c_str());
+        delete[] env_block;
+        return 1;
+    }
+    // Wait for process to finish
+    WaitForSingleObject(pi.hProcess, INFINITE);
+    DWORD exit_code = 0;
+    GetExitCodeProcess(pi.hProcess, &exit_code);
+    CloseHandle(pi.hProcess);
+    CloseHandle(pi.hThread);
+    delete[] env_block;
+    return (int)exit_code;
+#else
+    // Build char* array for execve
+    std::vector<char*> envp_cstrs;
+    envp_cstrs.reserve(merged_envp.size() + 1);
+    for (const auto& env : merged_envp) {
+        envp_cstrs.push_back(const_cast<char*>(env.c_str()));
+    }
+    envp_cstrs.push_back(nullptr);
+    int res = execve(path.c_str(), argv, envp_cstrs.data());
     if (res == -1)
     {
         fprintf(stderr, "ERROR: failed to execute '%s'\n", path.c_str());
         return 1;
     }
     return 0;
+#endif
 }