Commit bb891710 authored by Brad King's avatar Brad King 💬 Committed by Kitware Robot
Browse files

Merge topic 'fix-libarchive-gnutar-large-ids'

ad194ae0 libarchive: Use base-256 encoding for UID/GID like GNU tar does
parents f941ed7a ad194ae0
......@@ -644,18 +644,18 @@ 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);
/* TODO: How does GNU tar handle large UIDs? */
if (format_octal(archive_entry_uid(entry),
h + GNUTAR_uid_offset, GNUTAR_uid_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,
"Numeric user ID %jd too large",
(intmax_t)archive_entry_uid(entry));
ret = ARCHIVE_FAILED;
}
/* TODO: How does GNU tar handle large GIDs? */
if (format_octal(archive_entry_gid(entry),
h + GNUTAR_gid_offset, GNUTAR_gid_size)) {
/* 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",
(intmax_t)archive_entry_gid(entry));
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment