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

[Julien Nabet]

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

New commits:
commit 01ba3b43c16e2570022f20dbdf958a091a1fef0b
Author: Julien Nabet <serval2412 at yahoo.fr>
Date:   Sat Oct 7 22:58:34 2017 +0200

    tdf#112947: fix write to free'd memory (odbc)
    
    suggested by Nick Gorham
    
    Change-Id: I3579caf5192df6e460dea3a5b3728196d75a65f4
    Reviewed-on: https://gerrit.libreoffice.org/43234
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Julien Nabet <serval2412 at yahoo.fr>
    Reviewed-on: https://gerrit.libreoffice.org/43236
    Reviewed-by: Lionel Elie Mamane <lionel at mamane.lu>
    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 f7e2b978114a..8f1853a7623e 100644
--- a/connectivity/source/drivers/odbc/OResultSet.cxx
+++ b/connectivity/source/drivers/odbc/OResultSet.cxx
@@ -165,6 +165,7 @@ 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;
 }