diff options
| author | Stanislav Malyshev <stas@php.net> | 2015-05-12 14:26:06 -0700 |
|---|---|---|
| committer | Stanislav Malyshev <stas@php.net> | 2015-05-12 14:26:06 -0700 |
| commit | 587ddf6ddccd707d67d48dccd4f4ca0a90224ac9 (patch) | |
| tree | cf67e35a6088482a23861f25fe8e01a3213bb717 /sapi/phpdbg/phpdbg_parser.c | |
| parent | adbb301a70e16ada22f14a7e623b73d84580f12d (diff) | |
| parent | c08f9c2c786b0f7cbb401c18f6634cb5773f5baf (diff) | |
| download | php-git-587ddf6ddccd707d67d48dccd4f4ca0a90224ac9.tar.gz | |
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
fix format
update NEWS
Add test for bug #69522
Update tests
Fix bug #69522 - do not allow int overflow
Forgot test file
Fix bug #69403 and other int overflows
Fixed bug #69418 - more s->p fixes for filenames
Fixed bug #69364 - use smart_str to assemble strings
Fix bug #69453 - don't try to cut empty string
Fix bug #69545 - avoid overflow when reading list
Conflicts:
ext/standard/pack.c
Diffstat (limited to 'sapi/phpdbg/phpdbg_parser.c')
0 files changed, 0 insertions, 0 deletions