diff options
author | Andrea Faulds <ajf@ajf.me> | 2014-12-13 22:31:20 +0000 |
---|---|---|
committer | Andrea Faulds <ajf@ajf.me> | 2014-12-13 22:31:20 +0000 |
commit | a2038e68269a006efd1f5794f2f2d889e20871e2 (patch) | |
tree | 21eb4d646806a8f075bc743d4946c99edac283bb /ext/json/php_json_parser.h | |
parent | 2cca4d01935ffd5bd2ec6aad9eeccf6aee269933 (diff) | |
parent | 51771ed238fd27b2c756df532a67237d138cc174 (diff) | |
download | php-git-a2038e68269a006efd1f5794f2f2d889e20871e2.tar.gz |
Merge branch 'PHP-5.6'
* PHP-5.6:
Fix undefined behaviour in strnatcmp
update NEWS
move the test to the right place
Fixed bug #68545 NULL pointer dereference in unserialize.c
Diffstat (limited to 'ext/json/php_json_parser.h')
0 files changed, 0 insertions, 0 deletions