diff options
| author | Stanislav Malyshev <stas@php.net> | 2015-07-06 21:52:49 -0700 |
|---|---|---|
| committer | Stanislav Malyshev <stas@php.net> | 2015-07-06 21:52:49 -0700 |
| commit | 303d97feda15e97f9058e4ab96799ec2dbd3652f (patch) | |
| tree | 8071010fb681343c4f6e8b559dd29064072015bc /sapi/phpdbg/phpdbg_utils.c | |
| parent | 8f2e08239fc1f8aabc26398393303fa685e810dd (diff) | |
| parent | 0d2f147d80bd02d4d1ccaa0fa530d9d4846b3c75 (diff) | |
| download | php-git-303d97feda15e97f9058e4ab96799ec2dbd3652f.tar.gz | |
Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
Fix bug #69669 (mysqlnd is vulnerable to BACKRONYM)
Fix bug #69923 - Buffer overflow and stack smashing error in phar_fix_filepath
Fix bug #69958 - Segfault in Phar::convertToData on invalid file
Conflicts:
ext/mysqlnd/mysqlnd.c
Diffstat (limited to 'sapi/phpdbg/phpdbg_utils.c')
0 files changed, 0 insertions, 0 deletions