File php-CVE-2015-7804.patch of Package php5.openSUSE_13.2_Update

X-Git-Url: http://72.52.91.13:8000/?p=php-src.git;a=blobdiff_plain;f=ext%2Fphar%2Futil.c;h=303daede45570591c74e8fbc94f0d6ebf617a529;hp=e7decda9cde3741d0c4a9a4407a9795d45e6fdc0;hb=1ddf72180a52d247db88ea42a3e35f824a8fbda1;hpb=f98ab19dc0c978e3caaa2614579e4a61f2c317f5

diff --git a/ext/phar/util.c b/ext/phar/util.c
index e7decda..303daed 100644
--- ext/phar/util.c
+++ ext/phar/util.c
@@ -1977,7 +1977,7 @@ void phar_add_virtual_dirs(phar_archive_data *phar, char *filename, int filename
 
 	while ((s = zend_memrchr(filename, '/', filename_len))) {
 		filename_len = s - filename;
-		if (FAILURE == zend_hash_add_empty_element(&phar->virtual_dirs, filename, filename_len)) {
+		if (!filename_len || FAILURE == zend_hash_add_empty_element(&phar->virtual_dirs, filename, filename_len)) {
 			break;
 		}
 	}
X-Git-Url: http://72.52.91.13:8000/?p=php-src.git;a=blobdiff_plain;f=ext%2Fphar%2Fzip.c;h=e4883d3533dd8a297b7a6eaf8de10ef9c162e82d;hp=142165c31da4dc6748cf0c4befc0a4239d23989a;hb=1ddf72180a52d247db88ea42a3e35f824a8fbda1;hpb=f98ab19dc0c978e3caaa2614579e4a61f2c317f5

diff --git a/ext/phar/zip.c b/ext/phar/zip.c
index 142165c..e4883d3 100644
--- ext/phar/zip.c
+++ ext/phar/zip.c
@@ -396,7 +396,9 @@ foundit:
 
 		if (entry.filename[entry.filename_len - 1] == '/') {
 			entry.is_dir = 1;
-			entry.filename_len--;
+			if(entry.filename_len > 1) {
+				entry.filename_len--;
+			}
 			entry.flags |= PHAR_ENT_PERM_DEF_DIR;
 		} else {
 			entry.is_dir = 0;
X-Git-Url: http://72.52.91.13:8000/?p=php-src.git;a=blobdiff_plain;f=ext%2Fphar%2Fdirstream.c;h=4728e29f9c9303d3e5c206498744427da704bd79;hp=75cf049adefbd1e723a69e495016b31e20dbcf85;hb=e78ac461dbefb7c4a3e9fde78d50fbc56b7b0183;hpb=d698f0ae51f67c9cce870b09c59df3d6ba959244