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

Valgrind: Check function early to avoid nullptr deref

Browse Source 
Change-Id: I19da2e8f9dd3f6d7af0d412e07a257ba33ecb680
Reviewed-by: hjk <hjk@qt.io>
This commit is contained in:
Robert Loehning
2017-04-03 18:56:40 +02:00
committed by hjk
parent a49df50443
commit 60e3030082
1 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/plugins/valgrind/callgrind/callgrindproxymodel.cpp
View File

@@ -121,14 +121,17 @@ bool DataProxyModel::filterAcceptsRow(int source_row, const QModelIndex &source_
const Function *func = source_index.data(DataModel::FunctionRole).value<const Function *>(); const Function *func = source_index.data(DataModel::FunctionRole).value<const Function *>();
if (!func)
return false;
// check if func is located in the specific base directory, if any // check if func is located in the specific base directory, if any
if (func && !m_baseDir.isEmpty()) { if (!m_baseDir.isEmpty()) {
if (!func->location().startsWith(m_baseDir)) if (!func->location().startsWith(m_baseDir))
return false; return false;
} }
// check if the function from this index is a child of (called by) the filter function // check if the function from this index is a child of (called by) the filter function
if (func && m_function) { if (m_function) {
bool isValid = false; bool isValid = false;
foreach (const FunctionCall *call, func->incomingCalls()) { foreach (const FunctionCall *call, func->incomingCalls()) {
if (call->caller() == m_function) { if (call->caller() == m_function) {