diff options
| author | Christoph M. Becker <cmbecker69@gmx.de> | 2016-09-06 12:15:41 +0200 |
|---|---|---|
| committer | Christoph M. Becker <cmbecker69@gmx.de> | 2016-09-06 12:16:42 +0200 |
| commit | 5d394b3bb4b6e08049c4cb96c8c1c7a44074ad0e (patch) | |
| tree | e37bb7c62fcd81e249cb92c266d239c62c41fddd | |
| parent | 0adf9191adfbf26d071a86cc5814da822a994edf (diff) | |
| parent | af3031d755801546cc52117c5f8c864c062248b8 (diff) | |
| download | php-git-5d394b3bb4b6e08049c4cb96c8c1c7a44074ad0e.tar.gz | |
Merge branch 'PHP-7.0' into PHP-7.1
| -rw-r--r-- | NEWS | 4 | ||||
| -rw-r--r-- | Zend/zend_virtual_cwd.c | 2 |
2 files changed, 5 insertions, 1 deletions
@@ -2,6 +2,10 @@ PHP NEWS ||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||| ?? ??? 2016, PHP 7.1.0RC2 +- 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 --git a/Zend/zend_virtual_cwd.c b/Zend/zend_virtual_cwd.c index 09b9137ce4..cc3f908e88 100644 --- a/Zend/zend_virtual_cwd.c +++ b/Zend/zend_virtual_cwd.c @@ -1925,7 +1925,7 @@ CWD_API FILE *virtual_popen(const char *command, const char *type) /* {{{ */ #else /* Unix */ 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; |