Author: Jonas Devlieghere Date: 2022-04-27T16:37:42-07:00 New Revision: 5205c1774950b62dd410c69474295cd0f9351c7d
URL: https://github.com/llvm/llvm-project/commit/5205c1774950b62dd410c69474295cd0f9351c7d DIFF: https://github.com/llvm/llvm-project/commit/5205c1774950b62dd410c69474295cd0f9351c7d.diff LOG: [lldb] Fix escaping when launching in terminal with AppleScript Fix escaping when launching in terminal with AppleScript. The invocation we're building up is wrapped in single quotes when passed to bash and wrapped in double quotes for AppleScript. Here's an example invocation with the new escaping: tell application "Terminal" activate do script "/bin/bash -c 'arch -arch arm64 'darwin-debug' --unix-socket=/tmp/dL2jSh --arch=arm64 --working-dir \"/private/tmp/with spaces\" --disable-aslr -- \"foo\" \"bar\" \"baz\" ; echo Process exited with status $?';exit" end tell Previously we were using unescaped single quotes which resulted in the whole bash invocation being passed in pieces. That works most of the time but breaks when you have a space in your current working directory for example. rdar://91870763 Differential revision: https://reviews.llvm.org/D124568 Added: Modified: lldb/source/Host/macosx/objcxx/Host.mm Removed: ################################################################################ diff --git a/lldb/source/Host/macosx/objcxx/Host.mm b/lldb/source/Host/macosx/objcxx/Host.mm index 0a51e534896a1..ca6a408642ae8 100644 --- a/lldb/source/Host/macosx/objcxx/Host.mm +++ b/lldb/source/Host/macosx/objcxx/Host.mm @@ -212,18 +212,18 @@ repeat with the_window in (get windows)\n\ arch_spec.GetCore() != ArchSpec::eCore_x86_64_x86_64h) command.Printf("arch -arch %s ", arch_spec.GetArchitectureName()); - command.Printf("'%s' --unix-socket=%s", launcher_path, unix_socket_name); + command.Printf(R"(\"%s\" --unix-socket=%s)", launcher_path, unix_socket_name); if (arch_spec.IsValid()) command.Printf(" --arch=%s", arch_spec.GetArchitectureName()); FileSpec working_dir{launch_info.GetWorkingDirectory()}; if (working_dir) - command.Printf(" --working-dir '%s'", working_dir.GetCString()); + command.Printf(R"( --working-dir \"%s\")", working_dir.GetCString()); else { char cwd[PATH_MAX]; if (getcwd(cwd, PATH_MAX)) - command.Printf(" --working-dir '%s'", cwd); + command.Printf(R"( --working-dir \"%s\")", cwd); } if (launch_info.GetFlags().Test(eLaunchFlagDisableASLR)) @@ -239,7 +239,7 @@ repeat with the_window in (get windows)\n\ for (const auto &KV : launch_info.GetEnvironment()) { auto host_entry = host_env.find(KV.first()); if (host_entry == host_env.end() || host_entry->second != KV.second) - command.Format(" --env='{0}'", Environment::compose(KV)); + command.Format(R"( --env=\"{0}\")", Environment::compose(KV)); } command.PutCString(" -- "); @@ -248,12 +248,12 @@ repeat with the_window in (get windows)\n\ if (argv) { for (size_t i = 0; argv[i] != NULL; ++i) { if (i == 0) - command.Printf(" '%s'", exe_path); + command.Printf(R"( \"%s\")", exe_path); else - command.Printf(" '%s'", argv[i]); + command.Printf(R"( \"%s\")", argv[i]); } } else { - command.Printf(" '%s'", exe_path); + command.Printf(R"( \"%s\")", exe_path); } command.PutCString(" ; echo Process exited with status $?"); if (launch_info.GetFlags().Test(lldb::eLaunchFlagCloseTTYOnExit)) @@ -263,6 +263,7 @@ repeat with the_window in (get windows)\n\ applescript_source.Printf(applscript_in_new_tty, command.GetString().str().c_str()); + NSAppleScript *applescript = [[NSAppleScript alloc] initWithSource:[NSString stringWithCString:applescript_source.GetString() .str() _______________________________________________ lldb-commits mailing list lldb-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/lldb-commits
