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

Debugger: Fix crash in stack frame layout display.

Browse Source 
The option is also enabled when the index is invalid.

Task-number: QTCREATORBUG-5650
Change-Id: If1efb900d29724e5c43db1589c797197fae67bd2
Reviewed-on: http://codereview.qt.nokia.com/2342
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Christian Stenger <christian.stenger@nokia.com>
This commit is contained in:
Friedemann Kleint
2011-07-28 14:47:49 +02:00
parent f7bd1277f4
commit a1ffc4a19f
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/plugins/debugger/watchwindow.cpp
View File

@@ -416,6 +416,7 @@ static inline void addStackLayoutMemoryView(DebuggerEngine *engine,
QWidget *parent) QWidget *parent)
{ {
typedef QPair<quint64, QString> RegisterValueNamePair; typedef QPair<quint64, QString> RegisterValueNamePair;
QTC_ASSERT(engine && m, return ;)
// Determine suitable address range from locals // Determine suitable address range from locals
quint64 start = Q_UINT64_C(0xFFFFFFFFFFFFFFFF); quint64 start = Q_UINT64_C(0xFFFFFFFFFFFFFFFF);
@@ -895,7 +896,7 @@ void WatchWindow::contextMenuEvent(QContextMenuEvent *ev)
} else if (act == actOpenMemoryViewAtPointerValue) { } else if (act == actOpenMemoryViewAtPointerValue) {
addVariableMemoryView(currentEngine(), true, mi0, true, ev->globalPos(), this); addVariableMemoryView(currentEngine(), true, mi0, true, ev->globalPos(), this);
} else if (act == actOpenMemoryEditorStackLayout) { } else if (act == actOpenMemoryEditorStackLayout) {
addStackLayoutMemoryView(currentEngine(), false, mi0.model(), ev->globalPos(), this); addStackLayoutMemoryView(currentEngine(), false, model(), ev->globalPos(), this);
} else if (act == actSetWatchpointAtVariableAddress) { } else if (act == actSetWatchpointAtVariableAddress) {
setWatchpointAtAddress(address, size); setWatchpointAtAddress(address, size);
} else if (act == actSetWatchpointAtPointerValue) { } else if (act == actSetWatchpointAtPointerValue) {