Fix an issue where LLDB would not launch argdumper correctly if there were spaces in the path to it

llvm-svn: 253599

2 files changed, 5 insertions, 2 deletions

diff --git a/lldb/source/Host/macosx/Host.mm b/lldb/source/Host/macosx/Host.mm
index c3e2a898291..2db27a276e4 100644
--- a/lldb/source/Host/macosx/Host.mm
+++ b/lldb/source/Host/macosx/Host.mm
@@ -1366,8 +1366,11 @@ Host::ShellExpandArguments (ProcessLaunchInfo &launch_info)
             error.SetErrorStringWithFormat("could not find the lldb-argdumper tool: %s", expand_tool_spec.GetPath().c_str());
             return error;
         }
+        
+        StreamString expand_tool_spec_stream;
+        expand_tool_spec_stream.Printf("\"%s\"",expand_tool_spec.GetPath().c_str());
 
-        Args expand_command(expand_tool_spec.GetPath().c_str());
+        Args expand_command(expand_tool_spec_stream.GetData());
         expand_command.AppendArguments (launch_info.GetArguments());
         
         int status;
diff --git a/lldb/source/Host/windows/Host.cpp b/lldb/source/Host/windows/Host.cpp
index 5439467708b..2c9a139df25 100644
--- a/lldb/source/Host/windows/Host.cpp
+++ b/lldb/source/Host/windows/Host.cpp
@@ -245,7 +245,7 @@ Host::ShellExpandArguments (ProcessLaunchInfo &launch_info)
         std::replace(quoted_cmd_string.begin(), quoted_cmd_string.end(), '\\', '/');
         StreamString expand_command;
         
-        expand_command.Printf("%s %s",
+        expand_command.Printf("\"%s\" %s",
                               expand_tool_spec.GetPath().c_str(),
                               quoted_cmd_string.c_str());