[Libreoffice-commits] core.git: Branch 'libreoffice-5-4' - connectivity/source

[Julien Nabet]

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

New commits:
commit 1cb3e8f328dafffbe2449043894526f8d79405fb
Author: Julien Nabet <serval2412 at yahoo.fr>
Date:   Sat Jan 6 21:20:02 2018 +0100

    tdf#114495 ODBC: clear row status buffer *before* we throw away the statement
    
    Change-Id: I898e9d0e3e2cf1ed41489231d1cd761171bfcea4
    Reviewed-on: https://gerrit.libreoffice.org/47514
    Reviewed-by: Lionel Elie Mamane <lionel at mamane.lu>
    Tested-by: Lionel Elie Mamane <lionel at mamane.lu>
    Reviewed-on: https://gerrit.libreoffice.org/47526
    Tested-by: Jenkins <ci at libreoffice.org>
    Tested-by: Xisco Faulí <xiscofauli at libreoffice.org>

diff --git a/connectivity/source/drivers/odbc/OResultSet.cxx b/connectivity/source/drivers/odbc/OResultSet.cxx
index 8f1853a7623e..cb8c2c79531f 100644
--- a/connectivity/source/drivers/odbc/OResultSet.cxx
+++ b/connectivity/source/drivers/odbc/OResultSet.cxx
@@ -165,7 +165,6 @@ OResultSet::OResultSet(SQLHANDLE _pStatementHandle ,OStatement_Base* pStmt) :
 
 OResultSet::~OResultSet()
 {
-    setStmtOption<SQLUSMALLINT*, SQL_IS_POINTER>(SQL_ATTR_ROW_STATUS_PTR, nullptr);
     delete [] m_pRowStatusArray;
     delete m_pSkipDeletedSet;
 }
@@ -185,6 +184,7 @@ void OResultSet::disposing()
     ::osl::MutexGuard aGuard(m_aMutex);
     releaseBuffer();
 
+    setStmtOption<SQLUSMALLINT*, SQL_IS_POINTER>(SQL_ATTR_ROW_STATUS_PTR, nullptr);
     m_xStatement.clear();
     m_xMetaData.clear();
 }