1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert "MySQL: pedantism: create and destroy the MYSQL_TIME type"

Browse Source 
This reverts commit 6feb28918924d80c94b6f435bc3bc981855d59d6. It causes
a crash when field.myField is null.

Fixes: QTBUG-102489
Pick-to: 6.3
Change-Id: I7e305799c8594ebab255fffd16ee1a41cac8d387
Reviewed-by: Andy Shaw <andy.shaw@qt.io>
This commit is contained in:
Thiago Macieira 2022-05-11 09:35:11 -07:00
parent 8e07d5095b
commit 1c7ed7e73e
1 changed files with 3 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/plugins/sqldrivers/mysql/qsql_mysql.cpp
View File

@ -377,8 +377,6 @@ bool QMYSQLResultPrivate::bindInValues()
char *field = bind->buffer_length ? new char[bind->buffer_length + 1]{} : nullptr;
bind->buffer = f.outField = field;
if (qIsTimeOrDate(fieldInfo->type))
new (field) MYSQL_TIME;
++i;
}
@ -429,11 +427,9 @@ void QMYSQLResult::cleanup()
d->meta = 0;
}
for (const auto &field : qAsConst(d->fields)) {
if (qIsTimeOrDate(field.myField->type))
reinterpret_cast<MYSQL_TIME *>(field.outField)->~MYSQL_TIME();
delete[] field.outField;
}
int i;
for (i = 0; i < d->fields.count(); ++i)
delete[] d->fields[i].outField;
if (d->outBinds) {
delete[] d->outBinds;