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

SQL/OCI: Fix usage of QOCIResult::d_ptr

Browse Source 
The refactoring in 82681fd8a2af1113da5bd13875ba71c1efd45afb added a
d_ptr of type QOCIResultPrivate. This shadowed the d_ptr from
QSqlCachedResult and an unitialized QOCIResult::d_ptr variable which in
the end made the whole plugin unusable.
Fix it by removing the unneeded d_ptr member.

Pick-to: 6.9
Fixes: QTBUG-136024
Change-Id: I5ecacba8079eadbfae25a32720b43b4465c096d8
Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
This commit is contained in:
Christian Ehrlicher 2025-04-18 21:16:41 +02:00
parent 78ae4177fa
commit 87bbcddb1d
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/plugins/sqldrivers/oci/qsql_oci.cpp
View File

@ -414,11 +414,12 @@ int QOCIResultPrivate::bindValue(OCIStmt *sql, OCIBind **hbnd, OCIError *err, in
SQLT_RDD, indPtr, 0, 0, 0, 0, OCI_DEFAULT); SQLT_RDD, indPtr, 0, 0, 0, 0, OCI_DEFAULT);
} else if (val.canConvert<QOCIResult *>() && isOutValue(pos)) { } else if (val.canConvert<QOCIResult *>() && isOutValue(pos)) {
QOCIResult *res = qvariant_cast<QOCIResult *>(val); QOCIResult *res = qvariant_cast<QOCIResult *>(val);
QOCIResultPrivate *resPrivate = static_cast<QOCIResultPrivate *>(res->d_ptr);
if (res->internal_prepare()) { if (res->internal_prepare()) {
r = OCIBindByPos2(sql, hbnd, err, r = OCIBindByPos2(sql, hbnd, err,
pos + 1, pos + 1,
const_cast<OCIStmt **>(&res->d_ptr->sql), &resPrivate->sql,
(sb4)0, (sb4)0,
SQLT_RSET, indPtr, 0, 0, 0, 0, OCI_DEFAULT); SQLT_RSET, indPtr, 0, 0, 0, 0, OCI_DEFAULT);

1
src/plugins/sqldrivers/oci/qsql_oci_p.h
View File

@ -95,7 +95,6 @@ protected:
bool internal_prepare(); bool internal_prepare();
private: private:
QOCIResultPrivate *d_ptr;
Q_DECLARE_PRIVATE(QOCIResult) Q_DECLARE_PRIVATE(QOCIResult)
}; };