Issue 748: Regression test

diff --git a/libarchive/test/CMakeLists.txt b/libarchive/test/CMakeLists.txt
index 124aa3a8b1bae86db1c5fec5023ea1942fc35fbf..06913b6ffda6c210fd03e30daca6fbdf722de1eb 100644 (file)
--- a/libarchive/test/CMakeLists.txt
+++ b/libarchive/test/CMakeLists.txt
@@ -6,7 +6,7 @@
 IF(ENABLE_TEST)
   SET(libarchive_test_SOURCES
     ../../test_utils/test_utils.c
-   main.c
+    main.c
     read_open_memory.c
     test.h
     test_acl_freebsd_nfs4.c
@@ -164,6 +164,7 @@ IF(ENABLE_TEST)
     test_read_format_zip_encryption_header.c
     test_read_format_zip_encryption_partially.c
     test_read_format_zip_filename.c
+    test_read_format_zip_high_compression.c
     test_read_format_zip_mac_metadata.c
     test_read_format_zip_malformed.c
     test_read_format_zip_msdos.c

diff --git a/libarchive/test/test_read_format_zip_high_compression.c b/libarchive/test/test_read_format_zip_high_compression.c
new file mode 100644 (file)
index 0000000..79c923a
--- /dev/null
+++ b/libarchive/test/test_read_format_zip_high_compression.c
@@ -0,0 +1,142 @@
+/*-
+ * Copyright (c) 2016 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"
+__FBSDID("$FreeBSD");
+
+#include <locale.h>
+
+
+/*
+ * Github Issue 748 reported problems with end-of-entry handling
+ * with highly-compressible data.  This resulted in the end of the
+ * data being truncated (extracted as zero bytes).
+ */
+
+/*
+ * Extract the specific test archive that was used to diagnose
+ * Issue 748:
+ */
+DEFINE_TEST(test_read_format_zip_high_compression)
+{
+       const char *refname = "test_read_format_zip_high_compression.zip";
+       char *p;
+       size_t archive_size;
+       struct archive *a;
+       struct archive_entry *entry;
+
+       const void *pv;
+       size_t s;
+       int64_t o;
+
+       extract_reference_file(refname);
+       p = slurpfile(&archive_size, refname);
+
+       assert((a = archive_read_new()) != NULL);
+        assertEqualIntA(a, ARCHIVE_OK, archive_read_support_format_zip(a));
+        assertEqualIntA(a, ARCHIVE_OK, read_open_memory_seek(a, p, archive_size, 16 * 1024));
+       assertEqualInt(ARCHIVE_OK, archive_read_next_header(a, &entry));
+
+       assertEqualInt(ARCHIVE_OK, archive_read_data_block(a, &pv, &s, &o));
+       assertEqualInt(262144, s);
+       assertEqualInt(0, o);
+
+       assertEqualInt(ARCHIVE_OK, archive_read_data_block(a, &pv, &s, &o));
+       assertEqualInt(160, s);
+       assertEqualInt(262144, o);
+
+       assertEqualInt(ARCHIVE_EOF, archive_read_data_block(a, &pv, &s, &o));
+
+       assertEqualInt(ARCHIVE_OK, archive_free(a));
+       free(p);
+}
+
+/*
+ * Synthesize a lot of varying inputs that are highly compressible.
+ */
+DEFINE_TEST(test_read_format_zip_high_compression2)
+{
+       const size_t body_size = 1024 * 1024;
+       const size_t buff_size = 2 * 1024 * 1024;
+       char *body, *body_read, *buff;
+
+       assert((body = malloc(body_size)) != NULL);
+       assert((body_read = malloc(body_size)) != NULL);
+       assert((buff = malloc(buff_size)) != NULL);
+
+       /* Highly-compressible data: all bytes 255, except for a
+        * single 1 byte.
+        * The body is always 256k + 6 bytes long (the internal deflation
+        * buffer is exactly 256k).
+        */
+
+       for(int n = 1024; n < (int)body_size; n += 1024) {
+               struct archive *a;
+               struct archive_entry *entry;
+               size_t used = 0;
+               const void *pv;
+               size_t s;
+               int64_t o;
+
+               memset(body, 255, body_size);
+               body[n] = 1;
+
+               /* Write an archive with a single entry of n bytes. */
+               assert((a = archive_write_new()) != NULL);
+               assertEqualInt(ARCHIVE_OK, archive_write_set_format_zip(a));
+               assertEqualInt(ARCHIVE_OK, archive_write_open_memory(a, buff, buff_size, &used));
+
+               entry = archive_entry_new2(a);
+               archive_entry_set_pathname(entry, "test");
+               archive_entry_set_filetype(entry, AE_IFREG);
+               archive_entry_set_size(entry, 262150);
+               assertEqualInt(ARCHIVE_OK, archive_write_header(a, entry));
+               archive_entry_free(entry);
+               assertEqualInt(262150, archive_write_data(a, body, 262150));
+               assertEqualInt(ARCHIVE_OK, archive_write_free(a));
+
+               /* Read back the entry and verify the contents. */
+               assert((a = archive_read_new()) != NULL);
+               assertEqualIntA(a, ARCHIVE_OK, archive_read_support_format_all(a));
+               assertEqualIntA(a, ARCHIVE_OK, archive_read_support_filter_all(a));
+               assertEqualIntA(a, ARCHIVE_OK, read_open_memory(a, buff, used, 17));
+               assertEqualInt(ARCHIVE_OK, archive_read_next_header(a, &entry));
+
+               assertEqualInt(ARCHIVE_OK, archive_read_data_block(a, &pv, &s, &o));
+               assertEqualInt(262144, s);
+               assertEqualInt(0, o);
+
+               assertEqualInt(ARCHIVE_OK, archive_read_data_block(a, &pv, &s, &o));
+               assertEqualInt(6, s);
+               assertEqualInt(262144, o);
+
+               assertEqualInt(ARCHIVE_EOF, archive_read_data_block(a, &pv, &s, &o));
+
+               assertEqualInt(ARCHIVE_OK, archive_free(a));
+       }
+
+       free(body);
+       free(body_read);
+       free(buff);
+}

diff --git a/libarchive/test/test_read_format_zip_high_compression.zip.uu b/libarchive/test/test_read_format_zip_high_compression.zip.uu
new file mode 100644 (file)
index 0000000..0942880
--- /dev/null
+++ b/libarchive/test/test_read_format_zip_high_compression.zip.uu
@@ -0,0 +1,18 @@
+begin 644 test_read_format_zip_high_compression.zip
+M4$L#!!0`"``(`*=Y]4@``````````*``!``(`"``8VAA<BYB:6Y55`T`!\L>
+MD5>>))%7GB215W5X"P`!!/8!```$%````.W=06K#,!`%T&E)P8LL?*2XC@N%
+M)#5QO>AM<K0<+2=0:!OBP>@9WDJ6!%\6$K/Q6T3LAX]N/GQ'Z9G&KA^*K1'S
+M.`[GOIM*[TP_Q_>O0[G_:3X.Y\^^V/X2<<GT&IM=$]OK?[71_LJ],3;1+*(T
+M_U)99\T+````````````````````````````````````````L`:E?]*S#FVT
+MJY:='SPB>_]DR\X?`("_R:X_U"Y[_:F;;Q``ZN+L!P"H3W;]$_5G`&!9V?</
+M````X/FRZP_9LO,'@`S9YR^0P_Z'NF7?/P``````````````````````````
+M````````````````````````````````````````````````````````````
+M````````````````````````````````````````````````````````````
+M````````````````````````````````````````````````````````````
+M````````````````````````````````````````````````````````````
+MJ%L3VVM-LO,&8/UN4$L'"!<='%^U`0``H``$`%!+`0(4`Q0`"``(`*=Y]4@7
+M'1Q?M0$``*``!``(`"````````````"D@0````!C:&%R+F)I;E54#0`'RQZ1
+M5YXDD5>>))%7=7@+``$$]@$```04````4$L%!@`````!``$`5@````L"````
+!````
+`
+end