summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJulien Nabet <serval2412@yahoo.fr>2018-01-06 20:42:05 +0100
committerJulien Nabet <serval2412@yahoo.fr>2018-01-06 20:42:20 +0100
commit9dfd1f62ab0cf22d1f8550f64d03bcd3b94669c0 (patch)
tree520019f3797798d1f3830d38a50d969d531d1b89
parent6e21c087fdc49975d4ee5423b001b132d3a171a1 (diff)
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@yahoo.fr> Tested-by: Julien Nabet <serval2412@yahoo.fr>
-rw-r--r--connectivity/source/drivers/odbc/OResultSet.cxx3
1 files changed, 1 insertions, 2 deletions
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()