QSQL/ODBC: fix regression (trailing NUL)
authorDebian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>
Tue, 24 Oct 2023 11:07:10 +0000 (14:07 +0300)
committerDmitry Shachnev <mitya57@debian.org>
Tue, 24 Oct 2023 11:07:10 +0000 (14:07 +0300)
commit5f5c6467f8c340b61c0da0dbf79391863af2b300
tree974152ff19cd66969132d79be112cb318442a7a6
parent02c91e8e1217c6ae700ca3af01dff42ef9a405d8
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