diff options
| author | Stanislav Malyshev <stas@php.net> | 2016-05-24 17:58:37 -0700 |
|---|---|---|
| committer | Stanislav Malyshev <stas@php.net> | 2016-05-24 18:05:06 -0700 |
| commit | 3ed0114e7f25f683eede5528e3b31f2fe2495393 (patch) | |
| tree | edc79c2de02c26a783603059b94faf1f4ca6cbce /sapi/phpdbg/phpdbg_help.c | |
| parent | 2beacaad49a50b18bfdb03fdd5272d0f1daa19a1 (diff) | |
| parent | 9a826a3bd99315b7c4d4673acd3084c99eb04253 (diff) | |
| download | php-git-3ed0114e7f25f683eede5528e3b31f2fe2495393.tar.gz | |
Merge branch 'PHP-5.5' into PHP-7.0.7
* PHP-5.5:
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
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:
Zend/zend_operators.c
ext/intl/locale/locale_methods.c
ext/phar/dirstream.c
ext/phar/tests/bug71331.phpt
ext/standard/file.c
ext/standard/html.c
Diffstat (limited to 'sapi/phpdbg/phpdbg_help.c')
0 files changed, 0 insertions, 0 deletions