[Cmake-commits] CMake branch, next, updated. v3.0.0-4490-g807661b

Bill Hoffman bill.hoffman at kitware.com
Thu Jul 24 11:34:49 EDT 2014


This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".

The branch, next has been updated
       via  807661bce77368f303b4b5b95f41fd2c4e3131f2 (commit)
       via  0e88b1d6d92b32b767dff33109855f079a272f00 (commit)
      from  cefe04f03d6888be7a80509225f2f6f509d445a6 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=807661bce77368f303b4b5b95f41fd2c4e3131f2
commit 807661bce77368f303b4b5b95f41fd2c4e3131f2
Merge: cefe04f 0e88b1d
Author:     Bill Hoffman <bill.hoffman at kitware.com>
AuthorDate: Thu Jul 24 11:34:48 2014 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Thu Jul 24 11:34:48 2014 -0400

    Merge topic 'fix_qt4_automoc_leak' into next
    
    0e88b1d6 Fix memory leak of local generator detected by LeakSanitizer.


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=0e88b1d6d92b32b767dff33109855f079a272f00
commit 0e88b1d6d92b32b767dff33109855f079a272f00
Author:     Bill Hoffman <bill.hoffman at kitware.com>
AuthorDate: Thu Jul 24 11:33:54 2014 -0400
Commit:     Bill Hoffman <bill.hoffman at kitware.com>
CommitDate: Thu Jul 24 11:33:54 2014 -0400

    Fix memory leak of local generator detected by LeakSanitizer.

diff --git a/Source/cmQtAutoGenerators.cxx b/Source/cmQtAutoGenerators.cxx
index cc6932d..d4d565c 100644
--- a/Source/cmQtAutoGenerators.cxx
+++ b/Source/cmQtAutoGenerators.cxx
@@ -1000,6 +1000,7 @@ bool cmQtAutoGenerators::Run(const std::string& targetDirectory,
 
   this->WriteOldMocDefinitionsFile(targetDirectory);
 
+  delete gg->GetCurrentLocalGenerator();
   delete gg;
   gg = NULL;
   makefile = NULL;

-----------------------------------------------------------------------

Summary of changes:
 Source/cmQtAutoGenerators.cxx |    1 +
 1 file changed, 1 insertion(+)


hooks/post-receive
-- 
CMake


More information about the Cmake-commits mailing list