[Libreoffice-commits] core.git: Branch 'libreoffice-6-0' - connectivity/source

[Julien Nabet]

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

New commits:
commit 1572c3bde7fd30fc2e019ec3d7c6c629343b18e9
Author: Julien Nabet <serval2...@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
    (cherry picked from commit 964cc98794941dbf7dccce526c4fa88c16b3a26c)
    Reviewed-on: https://gerrit.libreoffice.org/47525
    Reviewed-by: Lionel Elie Mamane <lio...@mamane.lu>
    Tested-by: Jenkins <c...@libreoffice.org>

diff --git a/connectivity/source/drivers/odbc/OResultSet.cxx 
b/connectivity/source/drivers/odbc/OResultSet.cxx
index 8c8ccc7e28fb..40ca6d72c237 100644
--- a/connectivity/source/drivers/odbc/OResultSet.cxx
+++ b/connectivity/source/drivers/odbc/OResultSet.cxx
@@ -164,7 +164,6 @@ OResultSet::OResultSet(SQLHANDLE _pStatementHandle 
,OStatement_Base* pStmt) :
 
 OResultSet::~OResultSet()
 {
-    setStmtOption<SQLUSMALLINT*, SQL_IS_POINTER>(SQL_ATTR_ROW_STATUS_PTR, 
nullptr);
 }
 
 void OResultSet::construct()
@@ -182,6 +181,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();
 }
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits