User: rt      
Date: 2006/08/30 08:08:42

Modified:
   dba/connectivity/source/drivers/evoab2/NResultSet.cxx

Log:
 INTEGRATION: CWS cmcfixes27 (1.4.104); FILE MERGED
 2006/08/21 11:44:20 cmc 1.4.104.1: #i68705# fix memory leak

File Changes:

Directory: /dba/connectivity/source/drivers/evoab2/
===================================================

File [changed]: NResultSet.cxx
Url: 
http://dba.openoffice.org/source/browse/dba/connectivity/source/drivers/evoab2/NResultSet.cxx?r1=1.5&r2=1.6
Delta lines:  +4 -2
-------------------
--- NResultSet.cxx      28 Aug 2006 14:52:43 -0000      1.5
+++ NResultSet.cxx      30 Aug 2006 15:08:39 -0000      1.6
@@ -259,10 +259,11 @@
 
        if (pBook)
        {
+               g_list_free(m_pContacts);
+               m_pContacts = NULL;
                if( bIsWithoutWhere && !isLocal( pBook ) )
                {
                        OSL_TRACE( "large query on non-local book - ignored" );
-                       m_pContacts = NULL;
                        ::dbtools::throwGenericSQLException(
                                ::rtl::OUString::createFromAscii(
                                "Use SQL Query with \"where clause\" or 
\"criteria\", to get the results." ), NULL );
@@ -287,7 +288,8 @@
        OPropertySetHelper::disposing();
 
        ::osl::MutexGuard aGuard(m_aMutex);
-
+       g_list_free(m_pContacts);
+       m_pContacts = NULL;
        m_pStatement = NULL;
        m_xMetaData     = NULL;
 }




---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

Reply via email to