Sql: Fix heap-user-after-free for globally initialized db objects

Becaues the database objects were created as globals, there was a
possible use-after-free issue when deleting the objects on application
exit.

Move the initialization of the database objects into static variables
inside the test constructor.

As a drive-by, also add one missing test to the CMake projects.

Fixes: QTBUG-85357
Change-Id: I2c8f2c5daee96bb9d1d21dae37950a2da5ffdf27
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>

1 files changed, 23 insertions, 5 deletions

diff --git a/tests/auto/sql/models/qsqlrelationaltablemodel/tst_qsqlrelationaltablemodel.cpp b/tests/auto/sql/models/qsqlrelationaltablemodel/tst_qsqlrelationaltablemodel.cpp
index 722ef9c570..19d8430118 100644
--- a/tests/auto/sql/models/qsqlrelationaltablemodel/tst_qsqlrelationaltablemodel.cpp
+++ b/tests/auto/sql/models/qsqlrelationaltablemodel/tst_qsqlrelationaltablemodel.cpp
@@ -32,11 +32,11 @@
 
 #include "../../kernel/qsqldatabase/tst_databases.h"
 
-const QString reltest1(qTableName("reltest1", __FILE__, QSqlDatabase())),
-        reltest2(qTableName("reltest2", __FILE__, QSqlDatabase())),
-        reltest3(qTableName("reltest3", __FILE__, QSqlDatabase())),
-        reltest4(qTableName("reltest4", __FILE__, QSqlDatabase())),
-        reltest5(qTableName("reltest5", __FILE__, QSqlDatabase()));
+QString reltest1;
+QString reltest2;
+QString reltest3;
+QString reltest4;
+QString reltest5;
 
 class tst_QSqlRelationalTableModel : public QObject
 {
@@ -44,6 +44,7 @@ class tst_QSqlRelationalTableModel : public QObject
 
 public:
     void recreateTestTables(QSqlDatabase);
+    tst_QSqlRelationalTableModel();
 
     tst_Databases dbs;
 
@@ -83,6 +84,23 @@ private:
     void dropTestTables( QSqlDatabase db );
 };
 
+tst_QSqlRelationalTableModel::tst_QSqlRelationalTableModel()
+{
+    static QSqlDatabase static_qtest_db_1 = QSqlDatabase();
+    reltest1 = qTableName("reltest1", __FILE__, static_qtest_db_1);
+
+    static QSqlDatabase static_qtest_db_2 = QSqlDatabase();
+    reltest2 = qTableName("reltest2", __FILE__, static_qtest_db_2);
+
+    static QSqlDatabase static_qtest_db_3 = QSqlDatabase();
+    reltest3 = qTableName("reltest3", __FILE__, static_qtest_db_3);
+
+    static QSqlDatabase static_qtest_db_4 = QSqlDatabase();
+    reltest4 = qTableName("reltest4", __FILE__, static_qtest_db_4);
+
+    static QSqlDatabase static_qtest_db_5 = QSqlDatabase();
+    reltest5 = qTableName("reltest5", __FILE__, static_qtest_db_5);
+}
 
 void tst_QSqlRelationalTableModel::initTestCase_data()
 {