From: Christoph M. Becker <cmbecker69@gmx.de>
Date: Tue, 6 Sep 2016 10:10:38 +0000 (+0200)
Subject: Merge branch 'PHP-5.6' into PHP-7.0
X-Git-Tag: php-7.1.0RC2~54^2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=af3031d755801546cc52117c5f8c864c062248b8;p=php

Merge branch 'PHP-5.6' into PHP-7.0
---

af3031d755801546cc52117c5f8c864c062248b8
diff --cc NEWS
index 2a384db1e6,b11b28380a..5e2dbd067d
--- 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 4dbbb5ea5b,875c8da41c..980cc0be18
--- 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;