diff options
| author | Stanislav Malyshev <stas@php.net> | 2014-12-16 10:17:07 -0800 |
|---|---|---|
| committer | Stanislav Malyshev <stas@php.net> | 2014-12-16 10:17:07 -0800 |
| commit | 622a3463024c2ef121e31cbdcb53cf101399d5b3 (patch) | |
| tree | 9278503a62f62d4d8edbd089bfc5e976116502ae /ext/json/JSON_parser.c | |
| parent | 9c4de388c6adfa7207611e320343622ce8fde0f8 (diff) | |
| parent | 53f129a44d3c4ec0fae57993b9ae2f6cb48973cc (diff) | |
| download | php-git-622a3463024c2ef121e31cbdcb53cf101399d5b3.tar.gz | |
Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
add CVE
add missing test file
Fix bug #68594 - Use after free vulnerability in unserialize()
Diffstat (limited to 'ext/json/JSON_parser.c')
0 files changed, 0 insertions, 0 deletions