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

Valgrind: Fix possible crashes

Browse Source 
Change-Id: Ifae94d68d6c83f65a1938bfe41b4c5932407c0cf
Reviewed-by: hjk <hjk@theqtcompany.com>
This commit is contained in:
Christian Stenger
2015-06-12 08:34:41 +02:00
parent c7b81c60c3
commit 483b850aa0
2 changed files with 4 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/plugins/valgrind/callgrind/callgrindcallmodel.cpp
View File

@@ -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) {

5
src/plugins/valgrind/callgrind/callgrinddatamodel.cpp
View File

@@ -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());