diff options
| -rw-r--r-- | src/plugins/sqldrivers/sqlite/qsql_sqlite.cpp | 7 | ||||
| -rw-r--r-- | tests/auto/sql/kernel/qsqlquery/tst_qsqlquery.cpp | 10 |
2 files changed, 16 insertions, 1 deletions
diff --git a/src/plugins/sqldrivers/sqlite/qsql_sqlite.cpp b/src/plugins/sqldrivers/sqlite/qsql_sqlite.cpp index 9edf94abd2..60e871a25a 100644 --- a/src/plugins/sqldrivers/sqlite/qsql_sqlite.cpp +++ b/src/plugins/sqldrivers/sqlite/qsql_sqlite.cpp @@ -478,7 +478,12 @@ bool QSQLiteResult::exec() for (int i = 0, currentIndex = 0; i < values.size(); ++i) { if (handledIndexes.contains(i)) continue; - const auto placeHolder = QString::fromUtf8(sqlite3_bind_parameter_name(d->stmt, currentIndex + 1)); + const char *parameterName = sqlite3_bind_parameter_name(d->stmt, currentIndex + 1); + if (!parameterName) { + paramCountIsValid = false; + continue; + } + const auto placeHolder = QString::fromUtf8(parameterName); const auto &indexes = d->indexes.value(placeHolder); handledIndexes << indexes; prunedValues << values.at(indexes.first()); diff --git a/tests/auto/sql/kernel/qsqlquery/tst_qsqlquery.cpp b/tests/auto/sql/kernel/qsqlquery/tst_qsqlquery.cpp index e75c98839b..8b057ec039 100644 --- a/tests/auto/sql/kernel/qsqlquery/tst_qsqlquery.cpp +++ b/tests/auto/sql/kernel/qsqlquery/tst_qsqlquery.cpp @@ -2255,6 +2255,16 @@ void tst_QSqlQuery::prepare_bind_exec() QCOMPARE(q.boundValues().at(1).toString(), utf8str); } + // Test binding more placeholders than the query contains placeholders + q.addBindValue(8); + q.addBindValue(9); + q.addBindValue(10); + QCOMPARE(q.boundValues().size(), 3); + QCOMPARE(q.boundValues().at(0).toInt(), 8); + QCOMPARE(q.boundValues().at(1).toInt(), 9); + QCOMPARE(q.boundValues().at(2).toInt(), 10); + QFAIL_SQL(q, exec()); + QVERIFY_SQL( q, exec( "SELECT * FROM " + qtest_prepare + " order by id" ) ); for ( i = 0; i < 6; ++i ) { |