[Libreoffice-commits] .: 3 commits - dbaccess/source solenv/gbuild solenv/inc

[Stephan Bergmann]

 dbaccess/source/core/dataaccess/databasecontext.cxx |    5 ++++-
 solenv/gbuild/CppunitTest.mk                        |    1 -
 solenv/gbuild/platform/macosx.mk                    |    3 +++
 solenv/inc/settings.mk                              |    1 -
 4 files changed, 7 insertions(+), 3 deletions(-)

New commits:
commit 79fdb70baf70aeb492437ef85de7f02ad4234f21
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Mon Sep 19 21:39:46 2011 +0200

    Call macosx-change-install-names on executables in gbuild, too.

diff --git a/solenv/gbuild/platform/macosx.mk b/solenv/gbuild/platform/macosx.mk
index f71c5af..e30201b 100644
--- a/solenv/gbuild/platform/macosx.mk
+++ b/solenv/gbuild/platform/macosx.mk
@@ -337,6 +337,9 @@ $(call gb_Helper_abbreviate_dirs,\
 		$(LIBS) \
 		-o $(1) \
 		`cat $${DYLIB_FILE}` && \
+    $(if $(filter Executable,$(TARGETTYPE)), \
+        $(PERL) $(SOLARENV)/bin/macosx-change-install-names.pl Executable \
+            $(LAYER) $(1) &&) \
 	$(if $(filter Library CppunitTest,$(TARGETTYPE)),\
 		$(PERL) $(SOLARENV)/bin/macosx-change-install-names.pl Library $(LAYER) $(1) && \
 		ln -sf $(1) $(patsubst %.dylib,%.jnilib,$(1)) &&) \
commit 966f3c0f6df43185c572c451269604095428e917
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Mon Sep 19 15:53:25 2011 +0200

    Removed --leak-check=yes from CppUnit valgrind/memcheck calls.
    
    Can be enabled via VALGRIND_OPTS=--leak-check=yes.

diff --git a/solenv/gbuild/CppunitTest.mk b/solenv/gbuild/CppunitTest.mk
index cdfe4f0..e2010d5 100644
--- a/solenv/gbuild/CppunitTest.mk
+++ b/solenv/gbuild/CppunitTest.mk
@@ -43,7 +43,6 @@ endif
 ifneq ($(strip $(VALGRIND)),)
 gb_CppunitTest_VALGRINDTOOL := valgrind --tool=$(VALGRIND) --num-callers=50
 ifeq ($(strip $(VALGRIND)),memcheck)
-gb_CppunitTest_VALGRINDTOOL += --leak-check=yes
 G_SLICE := always-malloc
 export G_SLICE
 GLIBCXX_FORCE_NEW := 1
diff --git a/solenv/inc/settings.mk b/solenv/inc/settings.mk
index f395fa1..b5b7e60 100644
--- a/solenv/inc/settings.mk
+++ b/solenv/inc/settings.mk
@@ -1049,7 +1049,6 @@ GDBTRACE=gdb -nx --command=$(SOLARENV)/bin/gdbtrycatchtrace --args
 .IF "$(VALGRIND)" != ""
 VALGRINDTOOL=valgrind --tool=$(VALGRIND) --num-callers=50
 .IF "$(VALGRIND)" == "memcheck"
-VALGRINDTOOL+=--leak-check=yes
 G_SLICE*:=always-malloc
 .EXPORT : G_SLICE
 GLIBCXX_FORCE_NEW*:=1
commit c9b1cb5ae36b1057fb185945b52d3e45c5436bb6
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Mon Sep 19 15:49:25 2011 +0200

    Avoid premature deletion of objects in ODatabaseContext::m_aDatabaseObjects.
    
    Access of deleted objects found with valgrind/memcheck of dbaccess/qa/unoapi.

diff --git a/dbaccess/source/core/dataaccess/databasecontext.cxx b/dbaccess/source/core/dataaccess/databasecontext.cxx
index 22f77a7..f542d2b 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();
 }