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
87 lines
2.9 KiB
C++
87 lines
2.9 KiB
C++
//===-- CommandObjectScript.cpp ---------------------------------*- C++ -*-===//
|
|
//
|
|
// The LLVM Compiler Infrastructure
|
|
//
|
|
// This file is distributed under the University of Illinois Open Source
|
|
// License. See LICENSE.TXT for details.
|
|
//
|
|
//===----------------------------------------------------------------------===//
|
|
|
|
#include "CommandObjectScript.h"
|
|
|
|
// C Includes
|
|
// C++ Includes
|
|
// Other libraries and framework includes
|
|
// Project includes
|
|
|
|
#include "lldb/Core/Debugger.h"
|
|
|
|
#include "lldb/DataFormatters/DataVisualization.h"
|
|
|
|
#include "lldb/Interpreter/CommandInterpreter.h"
|
|
#include "lldb/Interpreter/CommandReturnObject.h"
|
|
#include "lldb/Interpreter/ScriptInterpreter.h"
|
|
#include "lldb/Utility/Args.h"
|
|
|
|
using namespace lldb;
|
|
using namespace lldb_private;
|
|
|
|
//-------------------------------------------------------------------------
|
|
// CommandObjectScript
|
|
//-------------------------------------------------------------------------
|
|
|
|
CommandObjectScript::CommandObjectScript(CommandInterpreter &interpreter,
|
|
ScriptLanguage script_lang)
|
|
: CommandObjectRaw(
|
|
interpreter, "script",
|
|
"Invoke the script interpreter with provided code and display any "
|
|
"results. Start the interactive interpreter if no code is supplied.",
|
|
"script [<script-code>]") {}
|
|
|
|
CommandObjectScript::~CommandObjectScript() {}
|
|
|
|
bool CommandObjectScript::DoExecute(llvm::StringRef command,
|
|
CommandReturnObject &result) {
|
|
#ifdef LLDB_DISABLE_PYTHON
|
|
// if we ever support languages other than Python this simple #ifdef won't
|
|
// work
|
|
result.AppendError("your copy of LLDB does not support scripting.");
|
|
result.SetStatus(eReturnStatusFailed);
|
|
return false;
|
|
#else
|
|
if (m_interpreter.GetDebugger().GetScriptLanguage() ==
|
|
lldb::eScriptLanguageNone) {
|
|
result.AppendError(
|
|
"the script-lang setting is set to none - scripting not available");
|
|
result.SetStatus(eReturnStatusFailed);
|
|
return false;
|
|
}
|
|
|
|
ScriptInterpreter *script_interpreter = m_interpreter.GetScriptInterpreter();
|
|
|
|
if (script_interpreter == nullptr) {
|
|
result.AppendError("no script interpreter");
|
|
result.SetStatus(eReturnStatusFailed);
|
|
return false;
|
|
}
|
|
|
|
DataVisualization::ForceUpdate(); // script might change Python code we use
|
|
// for formatting.. make sure we keep up to
|
|
// date with it
|
|
|
|
if (command.empty()) {
|
|
script_interpreter->ExecuteInterpreterLoop();
|
|
result.SetStatus(eReturnStatusSuccessFinishNoResult);
|
|
return result.Succeeded();
|
|
}
|
|
|
|
// We can do better when reporting the status of one-liner script execution.
|
|
if (script_interpreter->ExecuteOneLine(command, &result))
|
|
result.SetStatus(eReturnStatusSuccessFinishNoResult);
|
|
else
|
|
result.SetStatus(eReturnStatusFailed);
|
|
|
|
return result.Succeeded();
|
|
#endif
|
|
}
|