mirror of
https://github.com/Gericom/teak-llvm.git
synced 2025-06-22 21:15:40 -04:00
4d51a90297
Summary: This patch gets rid of the C-string parameter in the RawCommandObject::DoExecute function, making the code simpler and less memory unsafe. There seems to be a assumption in some command objects that this parameter could be a nullptr, but from what I can see the rest of the API doesn't actually allow this (and other command objects and related code pieces dereference this parameter without any checks). Especially CommandObjectRegexCommand has error handling code for a nullptr that is now gone. Reviewers: davide, jingham, teemperor Reviewed By: teemperor Subscribers: jingham, lldb-commits Differential Revision: https://reviews.llvm.org/D49207 llvm-svn: 336955
114 lines
4.6 KiB
C++
114 lines
4.6 KiB
C++
//===-- CommandObjectRegexCommand.cpp ---------------------------*- C++ -*-===//
|
|
//
|
|
// The LLVM Compiler Infrastructure
|
|
//
|
|
// This file is distributed under the University of Illinois Open Source
|
|
// License. See LICENSE.TXT for details.
|
|
//
|
|
//===----------------------------------------------------------------------===//
|
|
|
|
#include "lldb/Interpreter/CommandObjectRegexCommand.h"
|
|
|
|
// C Includes
|
|
// C++ Includes
|
|
// Other libraries and framework includes
|
|
// Project includes
|
|
#include "lldb/Interpreter/CommandInterpreter.h"
|
|
#include "lldb/Interpreter/CommandReturnObject.h"
|
|
|
|
using namespace lldb;
|
|
using namespace lldb_private;
|
|
|
|
//----------------------------------------------------------------------
|
|
// CommandObjectRegexCommand constructor
|
|
//----------------------------------------------------------------------
|
|
CommandObjectRegexCommand::CommandObjectRegexCommand(
|
|
CommandInterpreter &interpreter, llvm::StringRef name, llvm::StringRef help,
|
|
llvm::StringRef syntax, uint32_t max_matches, uint32_t completion_type_mask,
|
|
bool is_removable)
|
|
: CommandObjectRaw(interpreter, name, help, syntax),
|
|
m_max_matches(max_matches), m_completion_type_mask(completion_type_mask),
|
|
m_entries(), m_is_removable(is_removable) {}
|
|
|
|
//----------------------------------------------------------------------
|
|
// Destructor
|
|
//----------------------------------------------------------------------
|
|
CommandObjectRegexCommand::~CommandObjectRegexCommand() {}
|
|
|
|
bool CommandObjectRegexCommand::DoExecute(llvm::StringRef command,
|
|
CommandReturnObject &result) {
|
|
EntryCollection::const_iterator pos, end = m_entries.end();
|
|
for (pos = m_entries.begin(); pos != end; ++pos) {
|
|
RegularExpression::Match regex_match(m_max_matches);
|
|
|
|
if (pos->regex.Execute(command, ®ex_match)) {
|
|
std::string new_command(pos->command);
|
|
std::string match_str;
|
|
char percent_var[8];
|
|
size_t idx, percent_var_idx;
|
|
for (uint32_t match_idx = 1; match_idx <= m_max_matches; ++match_idx) {
|
|
if (regex_match.GetMatchAtIndex(command, match_idx, match_str)) {
|
|
const int percent_var_len =
|
|
::snprintf(percent_var, sizeof(percent_var), "%%%u", match_idx);
|
|
for (idx = 0; (percent_var_idx = new_command.find(
|
|
percent_var, idx)) != std::string::npos;) {
|
|
new_command.erase(percent_var_idx, percent_var_len);
|
|
new_command.insert(percent_var_idx, match_str);
|
|
idx += percent_var_idx + match_str.size();
|
|
}
|
|
}
|
|
}
|
|
// Interpret the new command and return this as the result!
|
|
if (m_interpreter.GetExpandRegexAliases())
|
|
result.GetOutputStream().Printf("%s\n", new_command.c_str());
|
|
// Pass in true for "no context switching". The command that called us
|
|
// should have set up the context appropriately, we shouldn't have to
|
|
// redo that.
|
|
return m_interpreter.HandleCommand(
|
|
new_command.c_str(), eLazyBoolCalculate, result, nullptr, true, true);
|
|
}
|
|
}
|
|
result.SetStatus(eReturnStatusFailed);
|
|
if (!GetSyntax().empty())
|
|
result.AppendError(GetSyntax());
|
|
else
|
|
result.GetOutputStream() << "Command contents '" << command
|
|
<< "' failed to match any "
|
|
"regular expression in the '"
|
|
<< m_cmd_name << "' regex ";
|
|
return false;
|
|
}
|
|
|
|
bool CommandObjectRegexCommand::AddRegexCommand(const char *re_cstr,
|
|
const char *command_cstr) {
|
|
m_entries.resize(m_entries.size() + 1);
|
|
// Only add the regular expression if it compiles
|
|
if (m_entries.back().regex.Compile(
|
|
llvm::StringRef::withNullAsEmpty(re_cstr))) {
|
|
m_entries.back().command.assign(command_cstr);
|
|
return true;
|
|
}
|
|
// The regex didn't compile...
|
|
m_entries.pop_back();
|
|
return false;
|
|
}
|
|
|
|
int CommandObjectRegexCommand::HandleCompletion(CompletionRequest &request) {
|
|
if (m_completion_type_mask) {
|
|
std::string completion_str(
|
|
request.GetParsedLine().GetArgumentAtIndex(request.GetCursorIndex()),
|
|
request.GetCursorCharPosition());
|
|
bool word_complete = request.GetWordComplete();
|
|
CommandCompletions::InvokeCommonCompletionCallbacks(
|
|
GetCommandInterpreter(), m_completion_type_mask, completion_str.c_str(),
|
|
request.GetMatchStartPoint(), request.GetMaxReturnElements(), nullptr,
|
|
word_complete, request.GetMatches());
|
|
request.SetWordComplete(word_complete);
|
|
return request.GetMatches().GetSize();
|
|
} else {
|
|
request.GetMatches().Clear();
|
|
request.SetWordComplete(false);
|
|
}
|
|
return 0;
|
|
}
|