com php-src: Merge branch 'PHP-5.6': ext/zip/lib/zip_dirent .c
| From: | Stanislav Malyshev | Date: | Wed, 18 Mar 2015 05:04:39 +0000 |
| Subject: | com php-src: Merge branch 'PHP-5.6': ext/zip/lib/zip_dirent .c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-85601@lists.php.net to get a copy of this message | ||
Commit: 1ecd82f58818fec41abbfae7fa0c15b6b7596a58
Author: Stanislav Malyshev <stas@php.net> Tue, 17 Mar 2015 22:04:39 -0700
Parents: 205fe3ab8912e4ab289b8b50343949e7fd084d4e 225cb973e5e8371b54d174c32f8685fcd2cf4098
Branches: master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=1ecd82f58818fec41abbfae7fa0c15b6b7596a58
Log:
Merge branch 'PHP-5.6'
* PHP-5.6:
update NEWS
Fix bug #69253 - ZIP Integer Overflow leads to writing past heap boundary
oops, no idea how this got in
Fix bug #69248 - heap overflow vulnerability in regcomp.c
add test for bug #68976
add NEWS
Fixed bug #68976 - Use After Free Vulnerability in unserialize()
update news
Fixed bug #69134 (Per Directory Values overrides PHP_INI_SYSTEM configuration options)
fix tests
Fix bug #69207 - move_uploaded_file allows nulls in path
Conflicts:
ext/ereg/regex/regcomp.c
ext/standard/basic_functions.c
ext/standard/var_unserializer.c
ext/standard/var_unserializer.re
win32/registry.c
Bugs:
https://bugs.php.net/69253
https://bugs.php.net/69248
https://bugs.php.net/68976
https://bugs.php.net/69134
https://bugs.php.net/69207
Changed paths:
MM ext/zip/lib/zip_dirent.c
Diff: