kolan
/
CMake
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'fix-untar-infinite-loop' into release

This commit is contained in:
Brad King 2012-11-26 11:56:31 -05:00
parent 84740c7448 37c34d7d7b
commit 82b077395d
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
Source/cmSystemTools.cxx
View File

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