QSQL/ODBC: fix regression (trailing NUL)
authorDebian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>
Tue, 21 May 2024 07:53:43 +0000 (10:53 +0300)
committerDmitry Shachnev <mitya57@debian.org>
Tue, 21 May 2024 07:53:43 +0000 (10:53 +0300)
commit265211972cd26383435285f4761c64e0bfdcd59c
tree0946cdc1e4914ba1aac4a6beb2b7a0dbe8dcc5a2
parent2da6a462d10910a9ce3acecfb5d25d69c3eebd33
QSQL/ODBC: fix regression (trailing NUL)

Origin: upstream, https://code.qt.io/cgit/qt/qtbase.git/commit/?id=9020034b3b6a3a81
Last-Update: 2023-06-30

When we fixed the callers of toSQLTCHAR() to use the result's size()
instead of the input's (which differ, if sizeof(SQLTCHAR) != 2), we
exposed callers to the append(0), which changes the size() of the
result QVLA. Callers that don't rely on NUL-termination (all?) now saw
an additional training NUL.

Fix by not NUL-terminating, and changing the only user of SQL_NTS to
use an explicit length.

Gbp-Pq: Name sql_odbc_fix_unicode_check.diff
src/plugins/sqldrivers/odbc/qsql_odbc.cpp