Add testcase for ZIPX files with LZMA_STREAM_END marker

Testcase for issue #1257 (PR #1297)

diff --git a/Makefile.am b/Makefile.am
index 41b2808e9f7d07c89c213342e533e1bba1cc7051..78d674d5d06699639e563d109c0e71eb227ab2a0 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -915,6 +915,7 @@ libarchive_test_EXTRA_DIST=\
        libarchive/test/test_read_format_zip_lzma.zipx.uu \
        libarchive/test/test_read_format_zip_lzma_alone_leak.zipx.uu \
        libarchive/test/test_read_format_zip_lzma_multi.zipx.uu \
+       libarchive/test/test_read_format_zip_lzma_stream_end.zipx.uu \
        libarchive/test/test_read_format_zip_jar.jar.uu \
        libarchive/test/test_read_format_zip_mac_metadata.zip.uu \
        libarchive/test/test_read_format_zip_malformed1.zip.uu \

diff --git a/libarchive/test/test_read_format_zip.c b/libarchive/test/test_read_format_zip.c
index 04f7e98ccfcd26a4a807c7fba2bc2471d5847caf..04dfecb015f8d943dd69aacaf7958874468e977f 100644 (file)
--- a/libarchive/test/test_read_format_zip.c
+++ b/libarchive/test/test_read_format_zip.c
@@ -916,3 +916,53 @@ DEFINE_TEST(test_read_format_zip_lzma_alone_leak)
         * suite under Valgrind or ASan, the test runner won't return with
         * exit code 0 in case if a memory leak. */
 }
+
+DEFINE_TEST(test_read_format_zip_lzma_stream_end)
+{
+       const char *refname = "test_read_format_zip_lzma_stream_end.zipx";
+       struct archive *a;
+       struct archive_entry *ae;
+
+       assert((a = archive_read_new()) != NULL);
+               if (ARCHIVE_OK != archive_read_support_filter_lzma(a)) {
+                               skipping("lzma reading not fully supported on this platform");
+                               assertEqualInt(ARCHIVE_OK, archive_read_free(a));
+                               return;
+               }
+       extract_reference_file(refname);
+
+       assertEqualIntA(a, ARCHIVE_OK, archive_read_support_format_zip(a));
+       assertEqualIntA(a, ARCHIVE_OK, archive_read_open_filename(a, refname, 37));
+       assertEqualIntA(a, ARCHIVE_OK, archive_read_next_header(a, &ae));
+       assertEqualString("ZIP 6.3 (lzma)", archive_format_name(a));
+       assertEqualString("vimrc", archive_entry_pathname(ae));
+       assertEqualIntA(a, 0, extract_one(a, ae, 0xBA8E3BAA));
+       assertEqualIntA(a, ARCHIVE_EOF, archive_read_next_header(a, &ae));
+       assertEqualIntA(a, ARCHIVE_OK, archive_read_close(a));
+       assertEqualIntA(a, ARCHIVE_OK, archive_read_free(a));
+}
+
+DEFINE_TEST(test_read_format_zip_lzma_stream_end_blockread)
+{
+       const char *refname = "test_read_format_zip_lzma_stream_end.zipx";
+       struct archive *a;
+       struct archive_entry *ae;
+
+       assert((a = archive_read_new()) != NULL);
+       if (ARCHIVE_OK != archive_read_support_filter_lzma(a)) {
+                       skipping("lzma reading not fully supported on this platform");
+                       assertEqualInt(ARCHIVE_OK, archive_read_free(a));
+                       return;
+       }
+       extract_reference_file(refname);
+
+       assertEqualIntA(a, ARCHIVE_OK, archive_read_support_format_zip(a));
+       assertEqualIntA(a, ARCHIVE_OK, archive_read_open_filename(a, refname, 37));
+       assertEqualIntA(a, ARCHIVE_OK, archive_read_next_header(a, &ae));
+       assertEqualString("ZIP 6.3 (lzma)", archive_format_name(a));
+       assertEqualString("vimrc", archive_entry_pathname(ae));
+       assertEqualIntA(a, 0, extract_one_using_blocks(a, 13, 0xBA8E3BAA));
+       assertEqualIntA(a, ARCHIVE_EOF, archive_read_next_header(a, &ae));
+       assertEqualIntA(a, ARCHIVE_OK, archive_read_close(a));
+       assertEqualIntA(a, ARCHIVE_OK, archive_read_free(a));
+}

diff --git a/libarchive/test/test_read_format_zip_lzma_stream_end.zipx.uu b/libarchive/test/test_read_format_zip_lzma_stream_end.zipx.uu
new file mode 100644 (file)
index 0000000..2b79bc2
--- /dev/null
+++ b/libarchive/test/test_read_format_zip_lzma_stream_end.zipx.uu
@@ -0,0 +1,19 @@
+begin 664 test_read_format_zip_lzma_stream_end.zipx
+M4$L#!#\``@`.`#TQD4VJ.XZZ/@(``)`#```%````=FEM<F,)!`4`70``@```
+M$0@$J,)\D;(#4L%<^$P5TO^CM0KI0HWG08B&_].4<,CJ")TW/L>)82Q1PWAL
+M+U`,N0L_$]^&650C/X$D6#4QFD$\A/"_![4!O/5O/!KH`WCQ*4?T2*]4P#/D
+M0'9I?EZG=N69Z0V;H0I=C<!C<J6O^834W097PY1$%=-++.YUA'!>P*$?".I\
+MGMG/80.A'^W>R4J'S/CZ%P`8`>F=R>R&R$2T@EM#X)"OQH1?A7,`:4IU9WV!
+M#2W*DXT',;.4YIN4A:-X)O=IREL201ZSOC=YSAU[C4-::/YV8\)%"L17+>VC
+M%/'B]ZCQN$2(Q*9*\KJZ`Y131`]5C&G';@1S-QES_RZF!2OX45@58+??ES%(
+MUJ<(\`11M$NO)HK#/MK-9RT"15.2I:IZN8<TJR>VTM1_?$G\L#BH67]$S%[4
+M%C-$\Q<+./&HV](4,7)OL-@C^M0F"2O!0N$OHOW54H87^QLBQVH*D%A<#SI%
+M/#+-5U(W';:KC)RE>0Y^5YI!RECQNR"R4.UW9IR!@:B!UB8?_D5$FT8YCJHJ
+M2[2"-&-_D2BJ6#XK[6G=%K"%;'^-+0]FHCY4ER#`^<I-M<!"D:-0H@);U"P"
+MPYX+4#8!&$7\M.+%%MZ:KQ2GX0<]$"P7F^HT)J5JM<$VO9/D[#7KZ\'FITL/
+MYIF"=GO+-L?F[8QS4KC7+=A)1`")V<.8DX629Q;;Y4XA\M-%O&MWC)^)`NO<
+M.J6(5V2UY9"I(C*QKA[Z-GJ<5/_O%<=P4$L!`C\#/P`"``X`/3&13:H[CKH^
+M`@``D`,```4``````````````+2!`````'9I;7)C4$L%!@`````!``$`,P``
+'`&$"````````
+`
+end