From d2f99c200fbebe851d33fb1b990953d7587b1f5d Mon Sep 17 00:00:00 2001 From: Rummskartoffel Date: Thu, 20 Jan 2022 22:04:57 +0100 Subject: [PATCH] UserspaceEmulator: Fix execve messing up command lines with "--" Emulator::virt$execve would construct command lines such as `/bin/UserspaceEmulator echo -- hello` instead of `/bin/UserspaceEmulator -- echo hello`, which naturally caused problems. This commit moves the "--" to the correct place. --- Userland/DevTools/UserspaceEmulator/Emulator_syscalls.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Userland/DevTools/UserspaceEmulator/Emulator_syscalls.cpp b/Userland/DevTools/UserspaceEmulator/Emulator_syscalls.cpp index ed29cbd10d..6b43e9ce45 100644 --- a/Userland/DevTools/UserspaceEmulator/Emulator_syscalls.cpp +++ b/Userland/DevTools/UserspaceEmulator/Emulator_syscalls.cpp @@ -1229,10 +1229,10 @@ int Emulator::virt$execve(FlatPtr params_addr) Vector envp; argv.append(const_cast("/bin/UserspaceEmulator")); - argv.append(const_cast(path.characters())); if (g_report_to_debug) argv.append(const_cast("--report-to-debug")); argv.append(const_cast("--")); + argv.append(const_cast(path.characters())); auto create_string_vector = [](auto& output_vector, auto& input_vector) { for (auto& string : input_vector)