summaryrefslogtreecommitdiff
path: root/connectivity
diff options
context:
space:
mode:
authorJulien Nabet <serval2412@yahoo.fr>2018-01-06 21:20:02 +0100
committerLionel Elie Mamane <lionel@mamane.lu>2018-01-10 15:36:01 +0100
commit1cb3e8f328dafffbe2449043894526f8d79405fb (patch)
treeb137d386a33ecfce7f96522e3d2fb135ec0c728e /connectivity
parentee6165a184b9ac7f004f2086adb669b5a31575cf (diff)
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@mamane.lu> Tested-by: Lionel Elie Mamane <lionel@mamane.lu> Reviewed-on: https://gerrit.libreoffice.org/47526 Tested-by: Jenkins <ci@libreoffice.org> Tested-by: Xisco FaulĂ­ <xiscofauli@libreoffice.org>
Diffstat (limited to 'connectivity')
-rw-r--r--connectivity/source/drivers/odbc/OResultSet.cxx2
1 files changed, 1 insertions, 1 deletions
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();
}