[Libreoffice-commits] core.git: Branch 'aoo/trunk' - dbaccess/source

[Damjan Jovanovic]

 dbaccess/source/core/api/RowSet.cxx |    1 +
 1 file changed, 1 insertion(+)

New commits:
commit 7678e87b129c0fbdaa397b7c103aeefc8891ab5e
Author: Damjan Jovanovic <damjan at apache.org>
Date:   Fri Aug 14 19:17:46 2015 +0000

    #i120706# CRASH - navigating tables containing NULL timestamps in DataSourceBrowser using mysql JDBC connector causes AOO to crash
    
    because the read-only column list was not kept in sync with the column list.

diff --git a/dbaccess/source/core/api/RowSet.cxx b/dbaccess/source/core/api/RowSet.cxx
index 5b7e0a1..d65a4e9 100644
--- a/dbaccess/source/core/api/RowSet.cxx
+++ b/dbaccess/source/core/api/RowSet.cxx
@@ -565,6 +565,7 @@ void ORowSet::freeResources( bool _bComplete )
         // the columns must be disposed before the querycomposer is disposed because
         // their owner can be the composer
         TDataColumns().swap(m_aDataColumns);// clear and resize capacity
+        m_aReadOnlyDataColumns.clear();
         m_xColumns      = NULL;
         if ( m_pColumns )
             m_pColumns->disposing();