intel/llvm
1
0
Fork 0
mirror of https://github.com/intel/llvm.git synced 2026-01-15 12:25:46 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix bug where using incomplete strings for command names causes

Browse Source 
lldb to crash (because of attempt to look for full names when full
names were not used).

llvm-svn: 121607
This commit is contained in:
Caroline Tice
2010-12-11 08:16:56 +00:00
parent 3434575704
commit 01274c098b
1 changed files with 10 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
lldb/source/Interpreter/CommandInterpreter.cpp
View File

@@ -710,6 +710,7 @@ CommandInterpreter::HandleCommand (const char *command_line,
// replacements taken care of; 3). whether or not the Execute function wants raw input or not.
StreamString revised_command_line;
size_t actual_cmd_name_len = 0;
while (!done)
{
StripFirstWord (command_string, next_word);
@@ -720,12 +721,14 @@ CommandInterpreter::HandleCommand (const char *command_line,
revised_command_line.Printf ("%s", alias_result.c_str());
if (cmd_obj)
wants_raw_input = cmd_obj->WantsRawCommandString ();
actual_cmd_name_len = strlen (cmd_obj->GetCommandName());
}
else if (!cmd_obj)
{
cmd_obj = GetCommandObject (next_word.c_str());
if (cmd_obj)
{
actual_cmd_name_len += next_word.length();
revised_command_line.Printf ("%s", next_word.c_str());
wants_raw_input = cmd_obj->WantsRawCommandString ();
}
@@ -739,6 +742,7 @@ CommandInterpreter::HandleCommand (const char *command_line,
CommandObject *sub_cmd_obj = ((CommandObjectMultiword *) cmd_obj)->GetSubcommandObject (next_word.c_str());
if (sub_cmd_obj)
{
actual_cmd_name_len += next_word.length() + 1;
revised_command_line.Printf (" %s", next_word.c_str());
cmd_obj = sub_cmd_obj;
wants_raw_input = cmd_obj->WantsRawCommandString ();
@@ -805,7 +809,12 @@ CommandInterpreter::HandleCommand (const char *command_line,
command_string = revised_command_line.GetData();
std::string command_name (cmd_obj->GetCommandName());
std::string remainder (command_string.substr (command_name.size()));
std::string remainder;
if (actual_cmd_name_len < command_string.length())
remainder = command_string.substr (actual_cmd_name_len); // Note: 'actual_cmd_name_len' may be considerably shorter
// than cmd_obj->GetCommandName(), because name completion
// allows users to enter short versions of the names,
// e.g. 'br s' for 'breakpoint set'.
// Remove any initial spaces
std::string white_space (" \t\v");