commit fe810f687eb6714f5dcc11e7ec47f9ed3fbf67e1
author Thomas Klausner <wiz@danbala.tuwien.ac.at> Sat Oct 20 14:04:27 2001 +0000
committer Thomas Klausner <wiz@danbala.tuwien.ac.at> Sat Oct 20 14:04:27 2001 +0000
tree b931160b2a5eac6083a2890bcc0b29467bf000a6
parent df2c3b139a74c5618b18367fd3417e717f3bed1a

Work around some broken zip files.

--HG--
branch : HEAD

lib/zip_open.c

diff --git a/lib/zip_open.c b/lib/zip_open.c
index 0ece065..44e215b 100644
--- a/lib/zip_open.c
+++ b/lib/zip_open.c
@@ -226,7 +226,10 @@
     zf->comlen = _zip_read2(&cdp);
     zf->entry = NULL;
 
-    if ((zf->comlen != comlen) || (entries != i)) {
+    /* XXX: some zip files are broken; their internal comment length
+       says 0, but they have 1 or 2 comment bytes */
+    if (((zf->comlen != comlen) && (zf->comlen != comlen-1) &&
+	 (zf->comlen != comlen-2)) || (entries != i)) {
 	/* comment size wrong -- too few or too many left after central dir */
 	/* or number of cdir-entries on this disk != number of cdir-entries */
 	zip_err = ZERR_NOZIP;