Add test case

diff --git a/Makefile.am b/Makefile.am
index 735a44ab91a769656190fbb1d0d64b9b95543f18..c2daa888b2a21f26fe6e12f67eed63bbb05c4f12 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -526,6 +526,7 @@ libarchive_test_SOURCES= \
        libarchive/test/test_read_format_rar5.c \
        libarchive/test/test_read_format_raw.c \
        libarchive/test/test_read_format_tar.c \
+       libarchive/test/test_read_format_tar_V_negative_size.c \
        libarchive/test/test_read_format_tar_concatenated.c \
        libarchive/test/test_read_format_tar_empty_pax.c \
        libarchive/test/test_read_format_tar_empty_filename.c \
@@ -977,6 +978,7 @@ libarchive_test_EXTRA_DIST=\
        libarchive/test/test_read_format_raw.data.gz.uu \
        libarchive/test/test_read_format_raw.data.Z.uu \
        libarchive/test/test_read_format_raw.data.uu \
+       libarchive/test/test_read_format_tar_V_negative_size.tar.uu \
        libarchive/test/test_read_format_tar_concatenated.tar.uu \
        libarchive/test/test_read_format_tar_empty_filename.tar.uu \
        libarchive/test/test_read_format_tar_empty_with_gnulabel.tar.uu \

diff --git a/libarchive/test/CMakeLists.txt b/libarchive/test/CMakeLists.txt
index b5acb468c4c92801f334d476ea82abd8aa8d0663..f62737d79f8b6cf03fd360d05e3a3512ec17f520 100644 (file)
--- a/libarchive/test/CMakeLists.txt
+++ b/libarchive/test/CMakeLists.txt
@@ -168,6 +168,7 @@ IF(ENABLE_TEST)
     test_read_format_rar5.c
     test_read_format_raw.c
     test_read_format_tar.c
+    test_read_format_tar_V_negative_size.c
     test_read_format_tar_concatenated.c
     test_read_format_tar_empty_filename.c
     test_read_format_tar_empty_with_gnulabel.c

diff --git a/libarchive/test/test_read_format_tar_V_negative_size.c b/libarchive/test/test_read_format_tar_V_negative_size.c
new file mode 100644 (file)
index 0000000..d110553
--- /dev/null
+++ b/libarchive/test/test_read_format_tar_V_negative_size.c
@@ -0,0 +1,48 @@
+/*-
+ * Copyright (c) 2025 Tim Kientzle
+ * 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"
+
+DEFINE_TEST(test_read_format_tar_V_negative_size)
+{
+       /*
+        * An archive that contains a `V` volume header with a negative body size
+        *
+        * This used to lead to an infinite loop:  the tar reader would "advance"
+        * by the size of the body to skip it, which would in this case end up
+        * reversing back to the beginning of the same header.
+        */
+       struct archive_entry *ae;
+       struct archive *a;
+       const char *refname = "test_read_format_tar_V_negative_size.tar";
+
+       extract_reference_file(refname);
+       assert((a = archive_read_new()) != NULL);
+       assertEqualInt(ARCHIVE_OK, archive_read_support_filter_all(a));
+       assertEqualInt(ARCHIVE_OK, archive_read_support_format_all(a));
+       assertEqualIntA(a, ARCHIVE_OK, archive_read_open_filename(a, refname, 10240));
+       assertEqualIntA(a, ARCHIVE_FATAL, archive_read_next_header(a, &ae));
+       assertEqualIntA(a, ARCHIVE_OK, archive_read_close(a));
+       assertEqualInt(ARCHIVE_OK, archive_read_free(a));
+}

diff --git a/libarchive/test/test_read_format_tar_V_negative_size.tar.uu b/libarchive/test/test_read_format_tar_V_negative_size.tar.uu
new file mode 100644 (file)
index 0000000..230d710
--- /dev/null
+++ b/libarchive/test/test_read_format_tar_V_negative_size.tar.uu
@@ -0,0 +1,20 @@
+Tar archive with a single `V` header that has a negative size.
+This used to result in an infinite loop -- the tar reader would
+"advance" by the size of the header, which in this case just backed
+up to re-read the same header again.
+
+begin 644 test_read_format_tar_V_negative_size.tar
+M`#(VXP```````````````````-Z;@"E&LOX^\@````````````!7````'```
+M````````````````````````````````````````````````````````````
+M``````````````````````````````````````````#___\````````@````
+M````````````````````````````5H%ZL#X]SH\-``":SN#[C4;Z5OOW-&']
+M?HHQ%WRG?Z$Q>^E#_1.OY96VEI*Z<U[)$TR502_;F$;9FU"/F'!`V:0`````
+M`````````````````````````````````````````````````````0``````
+M````````````````````````````````````````````````````````````
+M`````````````````````````````0``````````````````````````````
+M````````````````````````````````````````````````````````````
+M````````````````````````````````````````````````````````````
+M````````````````````````````````````````````````````````````
+1````````````````````````
+`
+end