[Cmake-commits] CMake branch, next, updated. v3.0.0-4461-g0bf9d58

Bill Hoffman bill.hoffman at kitware.com
Wed Jul 23 11:14:21 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  0bf9d5879e628db98995563428cd3089f4bede3b (commit)
       via  57a2df224a4bcf4463937d5e121f917d450c144f (commit)
      from  c8bae9bacafb95d99f9ebfacf8fdfedbbaf56760 (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=0bf9d5879e628db98995563428cd3089f4bede3b
commit 0bf9d5879e628db98995563428cd3089f4bede3b
Merge: c8bae9b 57a2df2
Author:     Bill Hoffman <bill.hoffman at kitware.com>
AuthorDate: Wed Jul 23 11:14:20 2014 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed Jul 23 11:14:20 2014 -0400

    Merge topic 'fix_tar_leaks' into next
    
    57a2df22 Fix memory leaks in extract tar.


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=57a2df224a4bcf4463937d5e121f917d450c144f
commit 57a2df224a4bcf4463937d5e121f917d450c144f
Author:     Bill Hoffman <bill.hoffman at kitware.com>
AuthorDate: Wed Jul 23 11:13:17 2014 -0400
Commit:     Bill Hoffman <bill.hoffman at kitware.com>
CommitDate: Wed Jul 23 11:13:17 2014 -0400

    Fix memory leaks in extract tar.

diff --git a/Source/cmSystemTools.cxx b/Source/cmSystemTools.cxx
index 444e143..fbb4416 100644
--- a/Source/cmSystemTools.cxx
+++ b/Source/cmSystemTools.cxx
@@ -1701,6 +1701,8 @@ bool extract_tar(const char* outFileName, bool verbose,
     {
     cmSystemTools::Error("Problem with archive_read_open_file(): ",
                          archive_error_string(a));
+    archive_write_free(ext);
+    archive_read_close(a);
     return false;
     }
   for (;;)
@@ -1776,6 +1778,7 @@ bool extract_tar(const char* outFileName, bool verbose,
         }
       }
     }
+  archive_write_free(ext);
   archive_read_close(a);
   archive_read_finish(a);
   return r == ARCHIVE_EOF || r == ARCHIVE_OK;

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

Summary of changes:
 Source/cmSystemTools.cxx |    3 +++
 1 file changed, 3 insertions(+)


hooks/post-receive
-- 
CMake


More information about the Cmake-commits mailing list