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

debugger: prevent crash when trying to view memory if bin editor is

Browse Source 
unavailable
This commit is contained in:
hjk
2009-11-19 09:51:21 +01:00
parent aa3b274a93
commit 4461ec2ef5
2 changed files with 18 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/plugins/debugger/debuggeragents.cpp
View File

@@ -44,6 +44,8 @@
#include <utils/qtcassert.h> #include <utils/qtcassert.h>
#include <QtCore/QDebug> #include <QtCore/QDebug>
#include <QtGui/QMessageBox>
#include <QtGui/QPlainTextEdit> #include <QtGui/QPlainTextEdit>
#include <QtGui/QTextCursor> #include <QtGui/QTextCursor>
#include <QtGui/QSyntaxHighlighter> #include <QtGui/QSyntaxHighlighter>
@@ -68,13 +70,13 @@ namespace Internal {
*/ */
MemoryViewAgent::MemoryViewAgent(DebuggerManager *manager, quint64 addr) MemoryViewAgent::MemoryViewAgent(DebuggerManager *manager, quint64 addr)
: QObject(manager), m_engine(manager->currentEngine()) : QObject(manager), m_engine(manager->currentEngine()), m_manager(manager)
{ {
init(addr); init(addr);
} }
MemoryViewAgent::MemoryViewAgent(DebuggerManager *manager, const QString &addr) MemoryViewAgent::MemoryViewAgent(DebuggerManager *manager, const QString &addr)
: QObject(manager), m_engine(manager->currentEngine()) : QObject(manager), m_engine(manager->currentEngine()), m_manager(manager)
{ {
bool ok = true; bool ok = true;
init(addr.toULongLong(&ok, 0)); init(addr.toULongLong(&ok, 0));
@@ -94,11 +96,19 @@ void MemoryViewAgent::init(quint64 addr)
m_editor = editorManager->openEditorWithContents( m_editor = editorManager->openEditorWithContents(
Core::Constants::K_DEFAULT_BINARY_EDITOR, Core::Constants::K_DEFAULT_BINARY_EDITOR,
&titlePattern); &titlePattern);
if (m_editor) {
connect(m_editor->widget(), SIGNAL(lazyDataRequested(quint64,bool)), connect(m_editor->widget(), SIGNAL(lazyDataRequested(quint64,bool)),
this, SLOT(fetchLazyData(quint64,bool))); this, SLOT(fetchLazyData(quint64,bool)));
editorManager->activateEditor(m_editor); editorManager->activateEditor(m_editor);
QMetaObject::invokeMethod(m_editor->widget(), "setLazyData", QMetaObject::invokeMethod(m_editor->widget(), "setLazyData",
Q_ARG(quint64, addr), Q_ARG(int, 1024 * 1024), Q_ARG(int, BinBlockSize)); Q_ARG(quint64, addr), Q_ARG(int, 1024 * 1024), Q_ARG(int, BinBlockSize));
} else {
m_manager->showMessageBox(QMessageBox::Warning,
tr("No memory viewer available"),
tr("The memory contents cannot be shown as no viewer plugin not "
"the BinEditor plugin could be loaded."));
deleteLater();
}
} }
void MemoryViewAgent::fetchLazyData(quint64 block, bool sync) void MemoryViewAgent::fetchLazyData(quint64 block, bool sync)

1
src/plugins/debugger/debuggeragents.h
View File

@@ -70,6 +70,7 @@ private:
QPointer<IDebuggerEngine> m_engine; QPointer<IDebuggerEngine> m_engine;
QPointer<Core::IEditor> m_editor; QPointer<Core::IEditor> m_editor;
QPointer<DebuggerManager> m_manager;
}; };