diff options
| author | Stanislav Malyshev <stas@php.net> | 2014-12-16 10:25:03 -0800 |
|---|---|---|
| committer | Stanislav Malyshev <stas@php.net> | 2014-12-16 10:25:03 -0800 |
| commit | 9152214c1e20723f73b5f7b6c77b1183327bcf69 (patch) | |
| tree | 02ad4cdec8d9631fc08b6014547c4ee82c167b48 /ext/zip/php_zip.c | |
| parent | 3a18597774d4b63a134db0c38235be9fa72f9560 (diff) | |
| parent | 681a1afd3f76e97b243184e83ab826633e851cc3 (diff) | |
| download | php-git-9152214c1e20723f73b5f7b6c77b1183327bcf69.tar.gz | |
Merge branch 'PHP-5.6'
* PHP-5.6:
update news
add CVE
add missing test file
Fix bug #68594 - Use after free vulnerability in unserialize()
Conflicts:
ext/standard/var_unserializer.c
ext/standard/var_unserializer.re
Diffstat (limited to 'ext/zip/php_zip.c')
0 files changed, 0 insertions, 0 deletions