From dcda950202545f0ecbe6a1192ec5aaae4af19227 Mon Sep 17 00:00:00 2001 From: Tomaz Canabrava Date: Mon, 31 Aug 2015 20:58:31 -0300 Subject: [PATCH] Fix recursive stack-overflow Only call this when needed, if there's no function set as callback, always return true. Signed-off-by: Tomaz Canabrava Signed-off-by: Dirk Hohndel --- qt-models/ssrfsortfilterproxymodel.cpp | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/qt-models/ssrfsortfilterproxymodel.cpp b/qt-models/ssrfsortfilterproxymodel.cpp index 1a8c835dc..b1a84a3f2 100644 --- a/qt-models/ssrfsortfilterproxymodel.cpp +++ b/qt-models/ssrfsortfilterproxymodel.cpp @@ -14,14 +14,16 @@ bool SsrfSortFilterProxyModel::lessThan(const QModelIndex& source_left, const QM bool SsrfSortFilterProxyModel::filterAcceptsRow(int source_row, const QModelIndex& source_parent) const { - Q_ASSERT(accepts_row); + if (!accepts_row) + return true; const QAbstractItemModel *self = this; return accepts_row(const_cast(self), source_row, source_parent); } bool SsrfSortFilterProxyModel::filterAcceptsColumn(int source_column, const QModelIndex& source_parent) const { - Q_ASSERT(accepts_col); + if (!accepts_col) + return true; const QAbstractItemModel *self = this; return accepts_col(const_cast(self), source_column, source_parent); }