1 files changed, 8 insertions, 8 deletions

diff --git a/src/plugins/sqldrivers/odbc/qsql_odbc.cpp b/src/plugins/sqldrivers/odbc/qsql_odbc.cpp
index 5bf23fdaed..07bd08ca82 100644
--- a/src/plugins/sqldrivers/odbc/qsql_odbc.cpp
+++ b/src/plugins/sqldrivers/odbc/qsql_odbc.cpp
@@ -221,18 +221,18 @@ public:
     int disconnectCount;
     bool hasSQLFetchScroll;
 
-    bool isStmtHandleValid();
+    bool isStmtHandleValid() const;
     void updateStmtHandleState();
 };
 
-bool QODBCResultPrivate::isStmtHandleValid()
+bool QODBCResultPrivate::isStmtHandleValid() const
 {
-    return disconnectCount == drv_d_func()->disconnectCount;
+    return drv_d_func() && disconnectCount == drv_d_func()->disconnectCount;
 }
 
 void QODBCResultPrivate::updateStmtHandleState()
 {
-    disconnectCount = drv_d_func()->disconnectCount;
+    disconnectCount = drv_d_func() ? drv_d_func()->disconnectCount : 0;
 }
 
 static QString qWarnODBCHandle(int handleType, SQLHANDLE handle, int *nativeCode = 0)
@@ -975,7 +975,7 @@ QODBCResult::QODBCResult(const QODBCDriver *db)
 QODBCResult::~QODBCResult()
 {
     Q_D(QODBCResult);
-    if (d->hStmt && d->isStmtHandleValid() && driver()->isOpen()) {
+    if (d->hStmt && d->isStmtHandleValid() && driver() && driver()->isOpen()) {
         SQLRETURN r = SQLFreeHandle(SQL_HANDLE_STMT, d->hStmt);
         if (r != SQL_SUCCESS)
             qSqlWarning(QLatin1String("QODBCDriver: Unable to free statement handle ")
@@ -1422,7 +1422,7 @@ bool QODBCResult::exec()
         SQLLEN *ind = &indicators[i];
         if (val.isNull())
             *ind = SQL_NULL_DATA;
-        switch (val.type()) {
+        switch (val.userType()) {
             case QVariant::Date: {
                 QByteArray &ba = tmpStorage[i];
                 ba.resize(sizeof(DATE_STRUCT));
@@ -1694,7 +1694,7 @@ bool QODBCResult::exec()
         return true;
 
     for (i = 0; i < values.count(); ++i) {
-        switch (values.at(i).type()) {
+        switch (values.at(i).userType()) {
             case QVariant::Date: {
                 DATE_STRUCT ds = *((DATE_STRUCT *)const_cast<char *>(tmpStorage.at(i).constData()));
                 values[i] = QVariant(QDate(ds.year, ds.month, ds.day));
@@ -1735,7 +1735,7 @@ bool QODBCResult::exec()
                 break; }
         }
         if (indicators[i] == SQL_NULL_DATA)
-            values[i] = QVariant(values[i].type());
+            values[i] = QVariant(QVariant::Type(values[i].userType()));
     }
     return true;
 }