From: Tim Kientzle Date: Fri, 30 May 2025 00:31:28 +0000 (-0700) Subject: Merge pull request #2634 from stoeckmann/tar_neg_time X-Git-Tag: v3.8.1~7 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=95a8adc7e5c49f3ba90b2e1fea70c9f1f6ccd748;p=thirdparty%2Flibarchive.git Merge pull request #2634 from stoeckmann/tar_neg_time tar: Support negative time values with pax (cherry picked from commit 9b07a143ee0e55d04ef602e926f2d343ee5a9a8f) --- diff --git a/Makefile.am b/Makefile.am index 22253d709..05232712a 100644 --- a/Makefile.am +++ b/Makefile.am @@ -534,6 +534,7 @@ libarchive_test_SOURCES= \ libarchive/test/test_read_format_tar_mac_metadata.c \ libarchive/test/test_read_format_tar_pax_g_large.c \ libarchive/test/test_read_format_tar_pax_large_attr.c \ + libarchive/test/test_read_format_tar_pax_negative_time.c \ libarchive/test/test_read_format_tbz.c \ libarchive/test/test_read_format_tgz.c \ libarchive/test/test_read_format_tlz.c \ @@ -980,6 +981,7 @@ libarchive_test_EXTRA_DIST=\ libarchive/test/test_read_format_tar_mac_metadata_1.tar.uu \ libarchive/test/test_read_format_tar_pax_g_large.tar.uu \ libarchive/test/test_read_format_tar_pax_large_attr.tar.Z.uu \ + libarchive/test/test_read_format_tar_pax_negative_time.tar.uu \ libarchive/test/test_read_format_ustar_filename_cp866.tar.Z.uu \ libarchive/test/test_read_format_ustar_filename_eucjp.tar.Z.uu \ libarchive/test/test_read_format_ustar_filename_koi8r.tar.Z.uu \ diff --git a/libarchive/archive_read_support_format_tar.c b/libarchive/archive_read_support_format_tar.c index 89875f64d..cdb1444fd 100644 --- a/libarchive/archive_read_support_format_tar.c +++ b/libarchive/archive_read_support_format_tar.c @@ -2272,12 +2272,16 @@ pax_attribute_read_time(struct archive_read *a, size_t value_length, int64_t *ps r = read_bytes_to_string(a, &as, value_length, unconsumed); if (r < ARCHIVE_OK) { archive_string_free(&as); + *ps = 0; + *pn = 0; return (r); } pax_time(as.s, archive_strlen(&as), ps, pn); archive_string_free(&as); - if (*ps < 0 || *ps == INT64_MAX) { + if (*ps == INT64_MIN) { + *ps = 0; + *pn = 0; return (ARCHIVE_WARN); } return (ARCHIVE_OK); @@ -2867,7 +2871,9 @@ pax_attribute(struct archive_read *a, struct tar *tar, struct archive_entry *ent /* - * parse a decimal time value, which may include a fractional portion + * Parse a decimal time value, which may include a fractional portion + * + * Sets ps to INT64_MIN on error. */ static void pax_time(const char *p, size_t length, int64_t *ps, long *pn) @@ -2883,6 +2889,7 @@ pax_time(const char *p, size_t length, int64_t *ps, long *pn) if (length <= 0) { *ps = 0; + *pn = 0; return; } s = 0; @@ -2896,8 +2903,9 @@ pax_time(const char *p, size_t length, int64_t *ps, long *pn) digit = *p - '0'; if (s > limit || (s == limit && digit > last_digit_limit)) { - s = INT64_MAX; - break; + *ps = INT64_MIN; + *pn = 0; + return; } s = (s * 10) + digit; ++p; diff --git a/libarchive/test/CMakeLists.txt b/libarchive/test/CMakeLists.txt index 1443f1c9d..b5acb468c 100644 --- a/libarchive/test/CMakeLists.txt +++ b/libarchive/test/CMakeLists.txt @@ -177,6 +177,7 @@ IF(ENABLE_TEST) test_read_format_tar_mac_metadata.c test_read_format_tar_pax_g_large.c test_read_format_tar_pax_large_attr.c + test_read_format_tar_pax_negative_time.c test_read_format_tbz.c test_read_format_tgz.c test_read_format_tlz.c diff --git a/libarchive/test/test_read_format_tar_pax_negative_time.c b/libarchive/test/test_read_format_tar_pax_negative_time.c new file mode 100644 index 000000000..b4edc3c2d --- /dev/null +++ b/libarchive/test/test_read_format_tar_pax_negative_time.c @@ -0,0 +1,68 @@ +/*- + * Copyright (c) 2025 Tobias Stoeckmann + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR(S) ``AS IS'' AND ANY EXPRESS OR + * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES + * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. + * IN NO EVENT SHALL THE AUTHOR(S) BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT + * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, + * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY + * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF + * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ +#include "test.h" + +/* + * Read a pax formatted tar archive that has a negative modification time. + */ +DEFINE_TEST(test_read_format_tar_pax_negative_time) +{ + char name[] = "test_read_format_tar_pax_negative_time.tar"; + struct archive_entry *ae; + struct archive *a; + + assert((a = archive_read_new()) != NULL); + assertEqualIntA(a, ARCHIVE_OK, archive_read_support_filter_all(a)); + assertEqualIntA(a, ARCHIVE_OK, archive_read_support_format_all(a)); + extract_reference_file(name); + assertEqualIntA(a, ARCHIVE_OK, archive_read_open_filename(a, name, 10240)); + + /* Read first entry. */ + assertEqualIntA(a, ARCHIVE_OK, archive_read_next_header(a, &ae)); + assertEqualString("empty", archive_entry_pathname(ae)); + assertEqualInt(-2146608000, archive_entry_atime(ae)); + assertEqualInt(0, archive_entry_atime_nsec(ae)); + assertEqualInt(1748089464, archive_entry_ctime(ae)); + assertEqualInt(951928467, archive_entry_ctime_nsec(ae)); + assertEqualInt(-2146608000, archive_entry_mtime(ae)); + assertEqualInt(0, archive_entry_mtime_nsec(ae)); + assertEqualInt(0, archive_entry_uid(ae)); + assertEqualString("root", archive_entry_uname(ae)); + assertEqualInt(0, archive_entry_gid(ae)); + assertEqualString("root", archive_entry_gname(ae)); + assertEqualInt(0100644, archive_entry_mode(ae)); + assertEqualInt(archive_entry_is_encrypted(ae), 0); + assertEqualIntA(a, archive_read_has_encrypted_entries(a), ARCHIVE_READ_FORMAT_ENCRYPTION_UNSUPPORTED); + + /* Verify the end-of-archive. */ + assertEqualIntA(a, ARCHIVE_EOF, archive_read_next_header(a, &ae)); + + /* Verify that the format detection worked. */ + assertEqualInt(archive_filter_code(a, 0), ARCHIVE_FILTER_NONE); + assertEqualInt(archive_format(a), ARCHIVE_FORMAT_TAR_PAX_INTERCHANGE); + + assertEqualInt(ARCHIVE_OK, archive_read_close(a)); + assertEqualInt(ARCHIVE_OK, archive_read_free(a)); +} diff --git a/libarchive/test/test_read_format_tar_pax_negative_time.tar.uu b/libarchive/test/test_read_format_tar_pax_negative_time.tar.uu new file mode 100644 index 000000000..fdf3fc304 --- /dev/null +++ b/libarchive/test/test_read_format_tar_pax_negative_time.tar.uu @@ -0,0 +1,60 @@ +begin 644 test_read_format_tar_pax_negative_time.tar +M4&%X2&5A9&5R+V5M<'1Y```````````````````````````````````````` +M```````````````````````````````````````````````````````````` +M`````````````#`P,#8T-"``,#`P,#`P(``P,#`P,#`@`#`P,#`P,#`P,3$P +M(#`P,#`P,#`P,#`P(#`Q-#`Q-P`@>``````````````````````````````` +M```````````````````````````````````````````````````````````` +M``````````````````````````````````````````!U