[Cmake-commits] CMake branch, next, updated. v2.8.10.1-1026-g994e8a9

[David Cole]

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  994e8a9d18641fb7a8b803da6d1f142ae43960ca (commit)
       via  2df1ca63ad377f25de72b2d9b1163a1b43ef110c (commit)
       via  e5748521206e1f240d495d1ec3b2ccd31611f081 (commit)
      from  ddaf6ec93166e0681bf916e1c438fdcab1399d17 (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=994e8a9d18641fb7a8b803da6d1f142ae43960ca
commit 994e8a9d18641fb7a8b803da6d1f142ae43960ca
Merge: ddaf6ec 2df1ca6
Author:     David Cole <david.cole at kitware.com>
AuthorDate: Mon Nov 26 06:25:00 2012 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Mon Nov 26 06:25:00 2012 -0500

    Merge topic 'fix-untar-infinite-loop' into next
    
    2df1ca6 CMake: Fix infinite loop untarring corrupt tar file
    e574852 CMake Nightly Date Stamp


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=2df1ca63ad377f25de72b2d9b1163a1b43ef110c
commit 2df1ca63ad377f25de72b2d9b1163a1b43ef110c
Author:     David Cole <david.cole at kitware.com>
AuthorDate: Mon Nov 26 06:22:52 2012 -0500
Commit:     David Cole <david.cole at kitware.com>
CommitDate: Mon Nov 26 06:22:52 2012 -0500

    CMake: Fix infinite loop untarring corrupt tar file
    
    Thanks to Rob Maynard for filling his hard drive over and over
    again with a runaway log file, and having the tenacity to make
    me track this down and fix it...
    
    ;-)

diff --git a/Source/cmSystemTools.cxx b/Source/cmSystemTools.cxx
index 89f03f6..544f7e4 100644
--- a/Source/cmSystemTools.cxx
+++ b/Source/cmSystemTools.cxx
@@ -1932,6 +1932,7 @@ bool extract_tar(const char* outFileName, bool verbose,
       {
       cmSystemTools::Error("Problem with archive_read_next_header(): ",
                            archive_error_string(a));
+      break;
       }
     if (verbose && extract)
       {
@@ -1954,6 +1955,7 @@ bool extract_tar(const char* outFileName, bool verbose,
         cmSystemTools::Error(
           "Problem with archive_write_disk_set_options(): ",
           archive_error_string(ext));
+        break;
         }
 
       r = archive_write_header(ext, entry);
@@ -1963,6 +1965,7 @@ bool extract_tar(const char* outFileName, bool verbose,
                              archive_error_string(ext));
         cmSystemTools::Error("Current file:",
                              archive_entry_pathname(entry));
+        break;
         }
       else
         {
@@ -1972,6 +1975,7 @@ bool extract_tar(const char* outFileName, bool verbose,
           {
           cmSystemTools::Error("Problem with archive_write_finish_entry(): ",
                                archive_error_string(ext));
+          break;
           }
         }
       }
@@ -1982,8 +1986,7 @@ bool extract_tar(const char* outFileName, bool verbose,
     }
   archive_read_close(a);
   archive_read_finish(a);
-  return true;
-
+  return r == ARCHIVE_EOF || r == ARCHIVE_OK;
 }
 }
 #endif

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

Summary of changes:
 Source/CMakeVersion.cmake |    2 +-
 Source/cmSystemTools.cxx  |    7 +++++--
 2 files changed, 6 insertions(+), 3 deletions(-)


hooks/post-receive
-- 
CMake