com php-src: Merge branch 'PHP-5.4' into PHP-5.5: ext/gd/gd_c tx.c main/network.c
| From: | Stanislav Malyshev | Date: | Tue, 19 Aug 2014 08:34:09 +0000 |
| Subject: | com php-src: Merge branch 'PHP-5.4' into PHP-5.5: ext/gd/gd_c tx.c main/network.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-80608@lists.php.net to get a copy of this message | ||
Commit: b278be894fcd0f2cbaee93e3f657f7f9beeb532f
Author: Stanislav Malyshev <stas@php.net> Tue, 19 Aug 2014 01:34:09 -0700
Parents: 335d89ec4d35d68d6443c7d51f99451a58c35b46 5a7039035ce22a68130af2309ff002a611976c87
Branches: PHP-5.5 PHP-5.6 master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=b278be894fcd0f2cbaee93e3f657f7f9beeb532f
Log:
Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
5.4.32
fix potentially missing NUL termination
Fix bug #67730 - Null byte injection possible with imagexxx functions
Fixed bug #67717 - segfault in dns_get_record
Fix bug #67716 - Segfault in cdf.c
5.4.32 RC1
Bugs:
https://bugs.php.net/67730
https://bugs.php.net/67717
https://bugs.php.net/67716
Changed paths:
MM ext/gd/gd_ctx.c
MM main/network.c
Diff: