feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Debugger: Do not crash in (im)possible situations

Browse Source 
Task-number: QTCREATORBUG-18427
Change-Id: I800c2f8d4ea37b28022d789a2e519e4f5286f08a
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@qt.io>
This commit is contained in:
hjk
2017-06-22 11:21:58 +02:00
parent 8ede32677e
commit 4ecb1283fe
1 changed files with 15 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
src/plugins/debugger/debuggerplugin.cpp
View File

@@ -2311,26 +2311,32 @@ void DebuggerPluginPrivate::requestContextMenu(TextEditorWidget *widget,
} }
// Run to, jump to line below in stopped state. // Run to, jump to line below in stopped state.
if (currentEngine()->state() == InferiorStopOk && args.isValid()) { DebuggerEngine *engine = currentEngine();
QTC_ASSERT(engine, return);
if (engine->state() == InferiorStopOk && args.isValid()) {
menu->addSeparator(); menu->addSeparator();
if (currentEngine()->hasCapability(RunToLineCapability)) { if (engine->hasCapability(RunToLineCapability)) {
auto act = menu->addAction(args.address auto act = menu->addAction(args.address
? DebuggerEngine::tr("Run to Address 0x%1").arg(args.address, 0, 16) ? DebuggerEngine::tr("Run to Address 0x%1").arg(args.address, 0, 16)
: DebuggerEngine::tr("Run to Line %1").arg(args.lineNumber)); : DebuggerEngine::tr("Run to Line %1").arg(args.lineNumber));
connect(act, &QAction::triggered, [this, args] { connect(act, &QAction::triggered, [this, args] {
currentEngine()->executeRunToLine(args); DebuggerEngine *engine = currentEngine();
QTC_ASSERT(engine, return);
engine->executeRunToLine(args);
}); });
} }
if (currentEngine()->hasCapability(JumpToLineCapability)) { if (engine->hasCapability(JumpToLineCapability)) {
auto act = menu->addAction(args.address auto act = menu->addAction(args.address
? DebuggerEngine::tr("Jump to Address 0x%1").arg(args.address, 0, 16) ? DebuggerEngine::tr("Jump to Address 0x%1").arg(args.address, 0, 16)
: DebuggerEngine::tr("Jump to Line %1").arg(args.lineNumber)); : DebuggerEngine::tr("Jump to Line %1").arg(args.lineNumber));
connect(act, &QAction::triggered, [this, args] { connect(act, &QAction::triggered, [this, args] {
currentEngine()->executeJumpToLine(args); DebuggerEngine *engine = currentEngine();
QTC_ASSERT(engine, return);
engine->executeJumpToLine(args);
}); });
} }
// Disassemble current function in stopped state. // Disassemble current function in stopped state.
if (currentEngine()->hasCapability(DisassemblerCapability)) { if (engine->hasCapability(DisassemblerCapability)) {
StackFrame frame; StackFrame frame;
frame.function = cppFunctionAt(args.fileName, lineNumber, 1); frame.function = cppFunctionAt(args.fileName, lineNumber, 1);
frame.line = 42; // trick gdb into mixed mode. frame.line = 42; // trick gdb into mixed mode.
@@ -2339,7 +2345,9 @@ void DebuggerPluginPrivate::requestContextMenu(TextEditorWidget *widget,
.arg(frame.function); .arg(frame.function);
auto act = new QAction(text, menu); auto act = new QAction(text, menu);
connect(act, &QAction::triggered, [this, frame] { connect(act, &QAction::triggered, [this, frame] {
currentEngine()->openDisassemblerView(Location(frame)); DebuggerEngine *engine = currentEngine();
QTC_ASSERT(engine, return);
engine->openDisassemblerView(Location(frame));
}); });
menu->addAction(act); menu->addAction(act);
} }