Fix a bug where LLDB would crash if 'apropos <anything>' was used after spawning an inferior process

llvm-svn: 266911

2 files changed, 10 insertions, 1 deletions

diff --git a/lldb/source/Commands/CommandObjectMultiword.cpp b/lldb/source/Commands/CommandObjectMultiword.cpp
index 887ce24..ae19976 100644
--- a/lldb/source/Commands/CommandObjectMultiword.cpp
+++ b/lldb/source/Commands/CommandObjectMultiword.cpp
@@ -367,6 +367,15 @@ CommandObjectProxy::IsMultiwordObject ()
     return false;
 }
 
+CommandObjectMultiword*
+CommandObjectProxy::GetAsMultiwordCommand ()
+{
+    CommandObject *proxy_command = GetProxyCommandObject();
+    if (proxy_command)
+        return proxy_command->GetAsMultiwordCommand();
+    return nullptr;
+}
+
 void
 CommandObjectProxy::GenerateHelpText (Stream &result)
 {
diff --git a/lldb/source/Interpreter/CommandInterpreter.cpp b/lldb/source/Interpreter/CommandInterpreter.cpp
index 064a95f..b28c44a 100644
--- a/lldb/source/Interpreter/CommandInterpreter.cpp
+++ b/lldb/source/Interpreter/CommandInterpreter.cpp
@@ -2806,7 +2806,7 @@ CommandInterpreter::FindCommandsForApropos (const char *search_word,
         
         if (cmd_obj->IsMultiwordObject())
         {
-            CommandObjectMultiword *cmd_multiword = (CommandObjectMultiword*)cmd_obj;
+            CommandObjectMultiword *cmd_multiword = cmd_obj->GetAsMultiwordCommand();
             FindCommandsForApropos(search_word,
                                    commands_found,
                                    commands_help,