[Cmake-commits] CMake branch, next, updated. v2.8.10.1-1051-gb7b4cd1

[Brad King]

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  b7b4cd14442a0041812f863904ace90e18341d80 (commit)
       via  37c34d7d7b7b32c0f6c00acbb3375c79e42a5587 (commit)
      from  c70fd06c17f79ffb599bd0769f21492f5169c124 (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=b7b4cd14442a0041812f863904ace90e18341d80
commit b7b4cd14442a0041812f863904ace90e18341d80
Merge: c70fd06 37c34d7
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Mon Nov 26 11:55:37 2012 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Mon Nov 26 11:55:37 2012 -0500

    Merge topic 'fix-untar-infinite-loop' into next
    
    37c34d7 CMake: Fix infinite loop untarring corrupt tar file


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=37c34d7d7b7b32c0f6c00acbb3375c79e42a5587
commit 37c34d7d7b7b32c0f6c00acbb3375c79e42a5587
Author:     David Cole <david.cole at kitware.com>
AuthorDate: Mon Nov 26 06:22:52 2012 -0500
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Mon Nov 26 11:54:38 2012 -0500

    CMake: Fix infinite loop untarring corrupt tar file
    
    Suggested-by: Robert Maynard <robert.maynard at kitware.com>

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:


hooks/post-receive
-- 
CMake