[Libreoffice-commits] core.git: connectivity/source

[Julien Nabet]

 connectivity/source/drivers/odbc/OResultSet.cxx |    3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

New commits:
commit 9dfd1f62ab0cf22d1f8550f64d03bcd3b94669c0
Author: Julien Nabet <serval2412 at yahoo.fr>
Date:   Sat Jan 6 20:42:05 2018 +0100

    Revert "tdf#114495: fix crash in odbc resultset dtr"
    
    This reverts commit 89e354eff9d99d05461e2892fb1af56d186b8653.
    
    Change-Id: I73435ba76d7d7ca7ebf91eeced470fb792786c92
    Reviewed-on: https://gerrit.libreoffice.org/47513
    Reviewed-by: Julien Nabet <serval2412 at yahoo.fr>
    Tested-by: Julien Nabet <serval2412 at yahoo.fr>

diff --git a/connectivity/source/drivers/odbc/OResultSet.cxx b/connectivity/source/drivers/odbc/OResultSet.cxx
index 25f05f1b9735..8c8ccc7e28fb 100644
--- a/connectivity/source/drivers/odbc/OResultSet.cxx
+++ b/connectivity/source/drivers/odbc/OResultSet.cxx
@@ -164,8 +164,7 @@ OResultSet::OResultSet(SQLHANDLE _pStatementHandle ,OStatement_Base* pStmt) :
 
 OResultSet::~OResultSet()
 {
-    if (m_xStatement)
-        setStmtOption<SQLUSMALLINT*, SQL_IS_POINTER>(SQL_ATTR_ROW_STATUS_PTR, nullptr);
+    setStmtOption<SQLUSMALLINT*, SQL_IS_POINTER>(SQL_ATTR_ROW_STATUS_PTR, nullptr);
 }
 
 void OResultSet::construct()