com php-src: Merge branch 'PHP-5.6' into PHP-7.0: NEWS Zend/zend_virtual_cwd.c
| From: | Christoph Michael Becker | Date: | Tue, 06 Sep 2016 10:11:24 +0000 |
| Subject: | com php-src: Merge branch 'PHP-5.6' into PHP-7.0: NEWS Zend/zend_virtual_cwd.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-94345@lists.php.net to get a copy of this message | ||
Commit: af3031d755801546cc52117c5f8c864c062248b8
Author: Christoph M. Becker <cmbecker69@gmx.de> Tue, 6 Sep 2016 12:10:38 +0200
Parents: a58e6d4e34927f59cb9a74d4d1d02fcccb599e98 dad793630d5966a9c22f3fcd7f24b7937bd1a36f
Branches: PHP-7.0 PHP-7.1 master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=af3031d755801546cc52117c5f8c864c062248b8
Log:
Merge branch 'PHP-5.6' into PHP-7.0
Changed paths:
MM NEWS
MM Zend/zend_virtual_cwd.c
Diff:
diff --cc NEWS
index 2a384db,b11b283..5e2dbd0
--- a/NEWS
+++ b/NEWS
@@@ -1,7 -1,11 +1,11 @@@
PHP NEWS
|||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
-?? ??? 2016, PHP 5.6.27
+?? ??? 2016 PHP 7.0.12
+ - Core:
+ . Fixed bug #73025 (Heap Buffer Overflow in virtual_popen of
+ zend_virtual_cwd.c). (cmb)
+
- Filter:
. Fixed bug #72972 (Bad filter for the flags FILTER_FLAG_NO_RES_RANGE and
FILTER_FLAG_NO_PRIV_RANGE). (julien)
diff --cc Zend/zend_virtual_cwd.c
index 4dbbb5ea,875c8da..980cc0b
--- a/Zend/zend_virtual_cwd.c
+++ b/Zend/zend_virtual_cwd.c
@@@ -1852,9 -1894,9 +1852,9 @@@ CWD_API FILE *virtual_popen(const char
}
/* }}} */
#else /* Unix */
-CWD_API FILE *virtual_popen(const char *command, const char *type TSRMLS_DC) /* {{{ */
+CWD_API FILE *virtual_popen(const char *command, const char *type) /* {{{ */
{
- int command_length;
+ size_t command_length;
int dir_length, extra = 0;
char *command_line;
char *ptr, *dir;