com php-src: Merge branch 'PHP-5.5' into PHP-5.6: ext/dom/document.c ext/gd/gd.c
| From: | Stanislav Malyshev | Date: | Tue, 09 Jun 2015 22:32:27 +0000 |
| Subject: | com php-src: Merge branch 'PHP-5.5' into PHP-5.6: ext/dom/document.c ext/gd/gd.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-87136@lists.php.net to get a copy of this message | ||
Commit: 8b1919ed73e89faad682211f12369167581332b4
Author: Stanislav Malyshev <stas@php.net> Tue, 9 Jun 2015 15:32:27 -0700
Parents: 8574290d9b9438a7ee168812fb6e67f094d4da78 4e2fb470929ab13101c945e76e2ac397a730ba5a
Branches: PHP-5.6
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=8b1919ed73e89faad682211f12369167581332b4
Log:
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
Fix bug #69646 OS command injection vulnerability in escapeshellarg
Fix #69719 - more checks for nulls in paths
fix test description
Fixed Buf #68812 Unchecked return value.
Bugs:
https://bugs.php.net/69646
https://bugs.php.net/69719
https://bugs.php.net/68812
Changed paths:
MM ext/dom/document.c
MM ext/gd/gd.c
Diff: