diff options
| author | Christian Stenger <christian.stenger@theqtcompany.com> | 2015-06-12 08:34:41 +0200 |
|---|---|---|
| committer | Christian Stenger <christian.stenger@theqtcompany.com> | 2015-06-15 06:37:36 +0000 |
| commit | 483b850aa06325a7d231b011d84775230131735c (patch) | |
| tree | 6d0fb9a0d5f2e7265ff0caefc461384ab056611a | |
| parent | c7b81c60c3c1aa2e840969c0d6b21d299bff55d5 (diff) | |
| download | qt-creator-483b850aa06325a7d231b011d84775230131735c.tar.gz | |
Valgrind: Fix possible crashes
Change-Id: Ifae94d68d6c83f65a1938bfe41b4c5932407c0cf
Reviewed-by: hjk <hjk@theqtcompany.com>
| -rw-r--r-- | src/plugins/valgrind/callgrind/callgrindcallmodel.cpp | 5 | ||||
| -rw-r--r-- | src/plugins/valgrind/callgrind/callgrinddatamodel.cpp | 5 |
2 files changed, 4 insertions, 6 deletions
diff --git a/src/plugins/valgrind/callgrind/callgrindcallmodel.cpp b/src/plugins/valgrind/callgrind/callgrindcallmodel.cpp index 44d8e33530..b743e679bc 100644 --- a/src/plugins/valgrind/callgrind/callgrindcallmodel.cpp +++ b/src/plugins/valgrind/callgrind/callgrindcallmodel.cpp @@ -167,9 +167,8 @@ QModelIndex CallModel::index(int row, int column, const QModelIndex &parent) con QVariant CallModel::data(const QModelIndex &index, int role) const { - //QTC_ASSERT(index.isValid() && index.model() == this, return QVariant()); - //QTC_ASSERT(index.column() >= 0 && index.column() < columnCount(index.parent()), return QVariant()); - //QTC_ASSERT(index.row() >= 0 && index.row() < rowCount(index.parent()), return QVariant()); + if (!index.isValid()) + return QVariant(); const FunctionCall *call = d->m_calls.at(index.row()); if (role == Qt::DisplayRole || role == Qt::ToolTipRole) { diff --git a/src/plugins/valgrind/callgrind/callgrinddatamodel.cpp b/src/plugins/valgrind/callgrind/callgrinddatamodel.cpp index 003f3c6408..2ee0cb4a9c 100644 --- a/src/plugins/valgrind/callgrind/callgrinddatamodel.cpp +++ b/src/plugins/valgrind/callgrind/callgrinddatamodel.cpp @@ -214,9 +214,8 @@ static QString shortenTemplate(QString str) QVariant DataModel::data(const QModelIndex &index, int role) const { - //QTC_ASSERT(index.isValid() && index.model() == this, return QVariant()); - //QTC_ASSERT(index.column() >= 0 && index.column() < columnCount(index.parent()), return QVariant()); - //QTC_ASSERT(index.row() >= 0 && index.row() < rowCount(index.parent()), return QVariant()); + if (!index.isValid()) + return QVariant(); const Function *func = d->m_functions.at(index.row()); |