diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2018-09-16 01:00:13 +0200 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2018-09-16 01:00:13 +0200 |
| commit | 4e0fcc6ffc2840f08478410a6f90c3044af247b3 (patch) | |
| tree | 1442b0919f09d9fc6f7e02fd3a0ab783aefe265b /src/plugins/sqldrivers/odbc | |
| parent | 6723155bc768790f14d97a61b74b01e7465ba199 (diff) | |
| parent | 6bb0cbc6865911c31f5edee7c24f270d265bd46d (diff) | |
Merge remote-tracking branch 'origin/5.12' into dev
Change-Id: Ic3ffc44d61448a44353c004b9f6703786cc1b213
Diffstat (limited to 'src/plugins/sqldrivers/odbc')
| -rw-r--r-- | src/plugins/sqldrivers/odbc/qsql_odbc.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/plugins/sqldrivers/odbc/qsql_odbc.cpp b/src/plugins/sqldrivers/odbc/qsql_odbc.cpp index daf9686b5e..1fbbcd0ef1 100644 --- a/src/plugins/sqldrivers/odbc/qsql_odbc.cpp +++ b/src/plugins/sqldrivers/odbc/qsql_odbc.cpp @@ -1307,7 +1307,7 @@ QVariant QODBCResult::data(int field) bool QODBCResult::isNull(int field) { Q_D(const QODBCResult); - if (field < 0 || field > d->fieldCache.size()) + if (field < 0 || field >= d->fieldCache.size()) return true; if (field <= d->fieldCacheIdx) { // since there is no good way to find out whether the value is NULL |