[Cmake-commits] CMake branch, next, updated. v3.2.1-1643-gfc2f2bd

[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  fc2f2bd87301bec14c1666a81d40b14b67c9cff9 (commit)
       via  91792cd17ecf0f129554ab632684c9e114e16248 (commit)
      from  2174a358603a43337be5e68408f19a2106555108 (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=fc2f2bd87301bec14c1666a81d40b14b67c9cff9
commit fc2f2bd87301bec14c1666a81d40b14b67c9cff9
Merge: 2174a35 91792cd
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Wed Apr 8 14:13:35 2015 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed Apr 8 14:13:35 2015 -0400

    Merge topic 'tar-write-format' into next
    
    91792cd1 fixup! libarchive: Use base-256 encoding for UID/GID like GNU tar does


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=91792cd17ecf0f129554ab632684c9e114e16248
commit 91792cd17ecf0f129554ab632684c9e114e16248
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Wed Apr 8 14:05:47 2015 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Wed Apr 8 14:05:47 2015 -0400

    fixup! libarchive: Use base-256 encoding for UID/GID like GNU tar does

diff --git a/Utilities/cmlibarchive/libarchive/archive_write_set_format_gnutar.c b/Utilities/cmlibarchive/libarchive/archive_write_set_format_gnutar.c
index 8f5400c..647079d 100644
--- a/Utilities/cmlibarchive/libarchive/archive_write_set_format_gnutar.c
+++ b/Utilities/cmlibarchive/libarchive/archive_write_set_format_gnutar.c
@@ -644,6 +644,7 @@ archive_format_gnutar_header(struct archive_write *a, char h[512],
 	format_octal(archive_entry_mode(entry) & 07777,
 	    h + GNUTAR_mode_offset, GNUTAR_mode_size);
 
+	/* GNU tar supports base-256 here, so should never overflow. */
 	if (format_number(archive_entry_uid(entry), h + GNUTAR_uid_offset,
 		GNUTAR_uid_size, GNUTAR_uid_max_size)) {
 		archive_set_error(&a->archive, ERANGE,
@@ -652,7 +653,8 @@ archive_format_gnutar_header(struct archive_write *a, char h[512],
 		ret = ARCHIVE_FAILED;
 	}
 
-	if (format_number(archive_entry_gid(entry), h + GNUTAR_gid_offset, 
+	/* GNU tar supports base-256 here, so should never overflow. */
+	if (format_number(archive_entry_gid(entry), h + GNUTAR_gid_offset,
 		GNUTAR_gid_size, GNUTAR_gid_max_size)) {
 		archive_set_error(&a->archive, ERANGE,
 		    "Numeric group ID %jd too large",

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

Summary of changes:
 .../cmlibarchive/libarchive/archive_write_set_format_gnutar.c      |    4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)


hooks/post-receive
-- 
CMake