[packages/php.git] / php-5.2.17-CVE-2011-0421.patch

--- PHP_5_3/ext/zip/lib/zip_name_locate.c	2011/01/30 22:16:39	307866
+++ PHP_5_3/ext/zip/lib/zip_name_locate.c	2011/01/30 22:28:57	307867
@@ -60,6 +60,10 @@
 	return -1;
     }
 
+    if((flags & ZIP_FL_UNCHANGED)  && !za->cdir) {
+    	return -1;
+    }
+
     cmp = (flags & ZIP_FL_NOCASE) ? strcmpi : strcmp;
 
     n = (flags & ZIP_FL_UNCHANGED) ? za->cdir->nentry : za->nentry;
Commit	Line	Data
82f6b657 ER	1	--- PHP_5_3/ext/zip/lib/zip_name_locate.c 2011/01/30 22:16:39 307866
	2	+++ PHP_5_3/ext/zip/lib/zip_name_locate.c 2011/01/30 22:28:57 307867
	3	@@ -60,6 +60,10 @@
	4	return -1;
	5	}
	6
	7	+ if((flags & ZIP_FL_UNCHANGED) && !za->cdir) {
	8	+ return -1;
	9	+ }
	10	+
	11	cmp = (flags & ZIP_FL_NOCASE) ? strcmpi : strcmp;
	12
	13	n = (flags & ZIP_FL_UNCHANGED) ? za->cdir->nentry : za->nentry;