current/SOURCES/libzip-0.11.2-CVE-2017-14107.patch

Index: libzip-0.11.1/lib/zip_open.c
===================================================================
--- libzip-0.11.1.orig/lib/zip_open.c   2017-09-06 14:50:09.872386069 +0200
+++ libzip-0.11.1/lib/zip_open.c        2017-09-06 14:50:09.876386143 +0200
@@ -726,7 +726,12 @@ _zip_read_eocd64(FILE *f, const zip_uint
         _zip_error_set(error, ZIP_ER_SEEK, EFBIG);
         return NULL;
     }
-    if ((flags & ZIP_CHECKCONS) && offset+size != eocd_offset) {
+    if (offset+size > buf_offset + eocd_offset) {
+       /* cdir spans past EOCD record */
+       _zip_error_set(error, ZIP_ER_INCONS, 0);
+       return NULL;
+    }
+    if ((flags & ZIP_CHECKCONS) && offset+size != buf_offset + eocd_offset) {
        _zip_error_set(error, ZIP_ER_INCONS, 0);
        return NULL;
     }
Index: libzip-0.11.1/regress/Makefile.am
===================================================================
--- libzip-0.11.1.orig/regress/Makefile.am      2013-04-17 10:58:09.000000000 +0200
+++ libzip-0.11.1/regress/Makefile.am   2017-09-06 14:51:42.470078673 +0200
@@ -129,7 +129,6 @@ TESTS= \
        extra_add_multiple.test \
        extra_count.test \
        extra_count_by_id.test \
-       extra_count_ignore_zip64.test \
        extra_delete.test \
        extra_delete_by_id.test \
        extra_get.test \
@@ -143,7 +142,6 @@ TESTS= \
        open_extrabytes.test \
        open_filename_empty.test \
        open_incons.test \
-       open_many_ok.test \
        open_new_but_exists.test \
        open_new_ok.test \
        open_nonarchive.test \
@@ -185,10 +183,12 @@ DISABLED_TESTS= \
        encoding-cp437.test \
        encoding-cp437-all.test \
        encoding-utf-8.test \
+       extra_count_ignore_zip64.test \
        open_filename_duplicate.test \
        open_filename_duplicate_consistency.test \
        open_filename_duplicate_empty.test \
        open_filename_duplicate_empty_consistency.test \
+       open_many_ok.test \
        torrent-new.test
 
 AM_CPPFLAGS=-I${top_srcdir}/lib -I../lib -I${top_srcdir}/src
1	Index: libzip-0.11.1/lib/zip_open.c
2	===================================================================
3	--- libzip-0.11.1.orig/lib/zip_open.c 2017-09-06 14:50:09.872386069 +0200
4	+++ libzip-0.11.1/lib/zip_open.c 2017-09-06 14:50:09.876386143 +0200
5	@@ -726,7 +726,12 @@ _zip_read_eocd64(FILE *f, const zip_uint
6	_zip_error_set(error, ZIP_ER_SEEK, EFBIG);
7	return NULL;
8	}
9	- if ((flags & ZIP_CHECKCONS) && offset+size != eocd_offset) {
10	+ if (offset+size > buf_offset + eocd_offset) {
11	+ /* cdir spans past EOCD record */
12	+ _zip_error_set(error, ZIP_ER_INCONS, 0);
13	+ return NULL;
14	+ }
15	+ if ((flags & ZIP_CHECKCONS) && offset+size != buf_offset + eocd_offset) {
16	_zip_error_set(error, ZIP_ER_INCONS, 0);
17	return NULL;
18	}
19	Index: libzip-0.11.1/regress/Makefile.am
20	===================================================================
21	--- libzip-0.11.1.orig/regress/Makefile.am 2013-04-17 10:58:09.000000000 +0200
22	+++ libzip-0.11.1/regress/Makefile.am 2017-09-06 14:51:42.470078673 +0200
23	@@ -129,7 +129,6 @@ TESTS= \
24	extra_add_multiple.test \
25	extra_count.test \
26	extra_count_by_id.test \
27	- extra_count_ignore_zip64.test \
28	extra_delete.test \
29	extra_delete_by_id.test \
30	extra_get.test \
31	@@ -143,7 +142,6 @@ TESTS= \
32	open_extrabytes.test \
33	open_filename_empty.test \
34	open_incons.test \
35	- open_many_ok.test \
36	open_new_but_exists.test \
37	open_new_ok.test \
38	open_nonarchive.test \
39	@@ -185,10 +183,12 @@ DISABLED_TESTS= \
40	encoding-cp437.test \
41	encoding-cp437-all.test \
42	encoding-utf-8.test \
43	+ extra_count_ignore_zip64.test \
44	open_filename_duplicate.test \
45	open_filename_duplicate_consistency.test \
46	open_filename_duplicate_empty.test \
47	open_filename_duplicate_empty_consistency.test \
48	+ open_many_ok.test \
49	torrent-new.test
50
51	AM_CPPFLAGS=-I${top_srcdir}/lib -I../lib -I${top_srcdir}/src