Fix crash when an invalid filter is set
authorHonglei Zhang <honglei.zhang@nokia.com>
Wed, 7 Mar 2012 16:54:58 +0000 (18:54 +0200)
committerQt by Nokia <qt-info@nokia.com>
Fri, 30 Mar 2012 17:51:43 +0000 (19:51 +0200)
commit06001ce0085c5fd47bbcc3c7ab151f7c0ac2f0ed
treeb1f2949df1825048a247ed3f91a994a188eb3dc2
parentfa9cf676159e8d9876c8532dc4e90f4bf5d9a47b
Fix crash when an invalid filter is set

QSqlTableModel::headerData() generates a crash if an invalid filter
is set. QSqlQueryModel::indexInQuery() should check the index value
before applied to d->colOffsets[].
QSqlQueryModel::initRecordAndPrimaryIndex() is updated to sync the
size of rec and colOffsets.

Task-number: QTBUG-23879
Change-Id: Ic9f88bb288592aa6fb3c1415cc818632dadaab56
Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
Reviewed-by: Mark Brand <mabrand@mabrand.nl>
src/sql/models/qsqlquerymodel.cpp
src/sql/models/qsqltablemodel.cpp
tests/auto/sql/models/qsqltablemodel/tst_qsqltablemodel.cpp