Avoid premature deletion of objects in ODatabaseContext::m_aDatabaseObjects.

Access of deleted objects found with valgrind/memcheck of dbaccess/qa/unoapi.

1 files changed, 4 insertions, 1 deletions

diff --git a/dbaccess/source/core/dataaccess/databasecontext.cxx b/dbaccess/source/core/dataaccess/databasecontext.cxx
index 22f77a71f6fb..f542d2b75477 100644
--- a/dbaccess/source/core/dataaccess/databasecontext.cxx
+++ b/dbaccess/source/core/dataaccess/databasecontext.cxx
@@ -291,7 +291,10 @@ void ODatabaseContext::disposing()
             ++aIter
         )
     {
-        aIter->second->dispose();
+        rtl::Reference< ODatabaseModelImpl > obj(aIter->second);
+            // make sure obj is acquired and does not delete itself from within
+            // dispose()
+        obj->dispose();
     }
     m_aDatabaseObjects.clear();
 }