diff options
author | Stanislav Malyshev <stas@php.net> | 2016-05-24 17:21:22 -0700 |
---|---|---|
committer | Stanislav Malyshev <stas@php.net> | 2016-05-24 17:21:22 -0700 |
commit | 2464b092eb14bf9bf3298acdc71e6b5deda042d1 (patch) | |
tree | 8167f6df1e1a788ba1da4a6f45cebbddf51caed7 /sapi/phpdbg/phpdbg_help.c | |
parent | f43f6fc39b92796aa934d4ae13675bb144d23435 (diff) | |
parent | 544940c48a6b39226d4af6a9033a53b2086de709 (diff) | |
download | php-git-2464b092eb14bf9bf3298acdc71e6b5deda042d1.tar.gz |
Merge branch 'PHP-5.6.22' into PHP-5.6
* PHP-5.6.22:
Fix memory leak in imagescale()
Update NEWS
Better fix for bug #72135
Fixed bug #72227: imagescale out-of-bounds read
Fix bug #72241: get_icu_value_internal out-of-bounds read
Fix bug #72135 - don't create strings with lengths outside int range
prepare for 5.6.22RC1
Add check for string overflow to all string add operations
Fix bug #72114 - int/size_t confusion in fread
Updated NEWS
Fixed bug #71331 - Uninitialized pointer in phar_make_dirstream()
Conflicts:
configure.in
main/php_version.h
Diffstat (limited to 'sapi/phpdbg/phpdbg_help.c')
0 files changed, 0 insertions, 0 deletions