diff options
| author | Anatol Belski <ab@php.net> | 2015-02-08 12:43:22 +0100 |
|---|---|---|
| committer | Anatol Belski <ab@php.net> | 2015-02-08 12:43:22 +0100 |
| commit | 371db55871bc66f33f549d6db2b2d8547aca2599 (patch) | |
| tree | 7e0c09e0383020306a5ee7334210794b0fb079b6 /ext/json/php_json_parser.h | |
| parent | 1c331d8d39e8013862cabc1d9cf942db89d7ad5a (diff) | |
| parent | ffdc2c4123f2c4c67d3140667862177a7bceb90e (diff) | |
| download | php-git-371db55871bc66f33f549d6db2b2d8547aca2599.tar.gz | |
Merge branch 'PHP-5.6'
* PHP-5.6:
Fix another invalid free of CG(interned_empty_string)
add tests for #68996
Fixed #68790 (Missing return)
Invalid free of CG(interned_empty_string)
Conflicts:
ext/soap/soap.c
ext/wddx/wddx.c
main/main.c
sapi/litespeed/lsapi_main.c
Diffstat (limited to 'ext/json/php_json_parser.h')
0 files changed, 0 insertions, 0 deletions