From ee75e06bdd287c16619e48c2368b203191cf9e72 Mon Sep 17 00:00:00 2001 From: Thomas Klausner Date: Sun, 28 Jul 2024 11:06:29 +0200 Subject: [PATCH] add two test files for duplicate zip64 entries InfoZIP likes one, libzip likes the other --- regress/incons-ef-local-dupe-zip64-v1.zip | Bin 0 -> 218 bytes regress/incons-ef-local-dupe-zip64-v2.zip | Bin 0 -> 218 bytes regress/open_incons.test | 8 ++++++-- 3 files changed, 6 insertions(+), 2 deletions(-) create mode 100644 regress/incons-ef-local-dupe-zip64-v1.zip create mode 100644 regress/incons-ef-local-dupe-zip64-v2.zip diff --git a/regress/incons-ef-local-dupe-zip64-v1.zip b/regress/incons-ef-local-dupe-zip64-v1.zip new file mode 100644 index 0000000000000000000000000000000000000000..2f11db4d79c4d12b16f922df8a5b05f127102e1a GIT binary patch literal 218 zcmWIWW@gc400IA^Xb1L%ukQYb0!9W623 zAXyM*gsKM74T2z!Zh$u%n+{YMrVYeJRtn zAe|u02vrTD8w5cd-2iVkHXW!iOdE)ctQ5r82N6Kv385H(`q)9t3Me0>KERum4a8*x JLXdihS^(&37S{j( literal 0 HcmV?d00001 diff --git a/regress/open_incons.test b/regress/open_incons.test index dbcbb8c1f..073db791f 100644 --- a/regress/open_incons.test +++ b/regress/open_incons.test @@ -18,6 +18,8 @@ file incons-data.zzip incons-data.zip file incons-ef-central-size-wrong.zzip incons-ef-central-size-wrong.zip file incons-ef-local-dupe-utf8comment.zzip incons-ef-local-dupe-utf8comment.zip file incons-ef-local-dupe-utf8name.zzip incons-ef-local-dupe-utf8name.zip +file incons-ef-local-dupe-zip64-v1.zzip incons-ef-local-dupe-zip64-v1.zip +file incons-ef-local-dupe-zip64-v2.zzip incons-ef-local-dupe-zip64-v2.zip file incons-ef-local-id-size.zzip incons-ef-local-id-size.zip file incons-ef-local-id.zzip incons-ef-local-id.zip file incons-ef-local-size.zzip incons-ef-local-size.zip @@ -40,7 +42,7 @@ file incons-local-filename.zzip incons-local-filename.zip file incons-local-magic-bad.zzip incons-local-magic-bad.zip file incons-local-size-larger.zzip incons-local-size-larger.zip file incons-stored-size.zzip incons-stored-size.zip -arguments -c incons-archive-comment-longer.zzip incons-archive-comment-shorter.zzip incons-cdoffset.zzip incons-central-compression-method.zzip incons-central-compsize-larger-toolarge.zzip incons-central-compsize-larger.zzip incons-central-compsize-smaller.zzip incons-central-crc.zzip incons-central-date.zzip incons-central-file-comment-longer.zzip incons-central-file-comment-shorter.zzip incons-central-magic-bad.zzip incons-central-magic-bad2.zzip incons-central-size-larger.zzip incons-data.zzip incons-ef-central-size-wrong.zzip incons-ef-local-dupe-utf8comment.zzip incons-ef-local-dupe-utf8name.zzip incons-ef-local-id-size.zzip incons-ef-local-id.zzip incons-ef-local-size.zzip incons-eocd-magic-bad.zzip incons-file-count-high.zzip incons-file-count-low.zzip incons-file-count-overflow.zzip incons-gap-before-cd.zzip incons-gap-before-eocd.zzip incons-gap-before-local.zzip incons-local-compression-method.zzip incons-local-compsize-larger.zzip incons-local-compsize-smaller.zzip incons-local-crc.zzip incons-local-filename-long.zzip incons-local-filename-missing.zzip incons-local-filename-nil-byte.zzip incons-local-filename-short.zzip incons-local-filename.zzip incons-local-magic-bad.zzip incons-local-size-larger.zzip incons-stored-size.zzip +arguments -c incons-archive-comment-longer.zzip incons-archive-comment-shorter.zzip incons-cdoffset.zzip incons-central-compression-method.zzip incons-central-compsize-larger-toolarge.zzip incons-central-compsize-larger.zzip incons-central-compsize-smaller.zzip incons-central-crc.zzip incons-central-date.zzip incons-central-file-comment-longer.zzip incons-central-file-comment-shorter.zzip incons-central-magic-bad.zzip incons-central-magic-bad2.zzip incons-central-size-larger.zzip incons-data.zzip incons-ef-central-size-wrong.zzip incons-ef-local-dupe-utf8comment.zzip incons-ef-local-dupe-utf8name.zzip incons-ef-local-dupe-zip64-v1.zzip incons-ef-local-dupe-zip64-v2.zzip incons-ef-local-id-size.zzip incons-ef-local-id.zzip incons-ef-local-size.zzip incons-eocd-magic-bad.zzip incons-file-count-high.zzip incons-file-count-low.zzip incons-file-count-overflow.zzip incons-gap-before-cd.zzip incons-gap-before-eocd.zzip incons-gap-before-local.zzip incons-local-compression-method.zzip incons-local-compsize-larger.zzip incons-local-compsize-smaller.zzip incons-local-crc.zzip incons-local-filename-long.zzip incons-local-filename-missing.zzip incons-local-filename-nil-byte.zzip incons-local-filename-short.zzip incons-local-filename.zzip incons-local-magic-bad.zzip incons-local-size-larger.zzip incons-stored-size.zzip return 1 # tryopen does not test checksums, so this is fine. # different extra fields local vs. central is fine @@ -63,6 +65,8 @@ opening 'incons-data.zzip' succeeded, 1 entries opening 'incons-ef-central-size-wrong.zzip' returned error 21/16 opening 'incons-ef-local-dupe-utf8comment.zzip' succeeded, 1 entries opening 'incons-ef-local-dupe-utf8name.zzip' returned error 21/6 +opening 'incons-ef-local-dupe-zip64-v1.zzip' returned error 21/6 +opening 'incons-ef-local-dupe-zip64-v2.zzip' succeeded, 1 entries opening 'incons-ef-local-id-size.zzip' returned error 21/16 opening 'incons-ef-local-id.zzip' succeeded, 1 entries opening 'incons-ef-local-size.zzip' returned error 21/16 @@ -87,5 +91,5 @@ opening 'incons-local-size-larger.zzip' returned error 21/6 opening 'incons-stored-size.zzip' succeeded, 1 entries end-of-inline-data stderr -33 errors +34 errors end-of-inline-data