Fixed bug #70018 (exec does not strip all whitespace)

laruence · laruence · commit da333bfbd8ed · 2015-07-08T19:30:58.000+08:00
Merge branch 'PHP-5.6'

Conflicts:
	ext/standard/exec.c
diff --git a/NEWS b/NEWS
@@ -5,6 +5,9 @@
 - Core:
   . Fixed bug #70012 (Exception lost with nested finally block). (Laruence)
 
+- Standard:
+  . Fixed bug #70018 (exec does not strip all whitespace). (Laruence)
+
 09 Jul 2015, PHP 7.0.0 Beta 1
 
 - Core:
diff --git a/ext/standard/exec.c b/ext/standard/exec.c
@@ -116,7 +116,7 @@ PHPAPI int php_exec(int type, char *cmd, zval *array, zval *return_value)
 			} else if (type == 2) {
 				/* strip trailing whitespaces */
 				l = bufl;
-				while (l >= 1 && l-- && isspace(((unsigned char *)buf)[l]));
+				while (l-- > 0 && isspace(((unsigned char *)buf)[l]));
 				if (l != (bufl - 1)) {
 					bufl = l + 1;
 					buf[bufl] = '\0';
@@ -129,7 +129,7 @@ PHPAPI int php_exec(int type, char *cmd, zval *array, zval *return_value)
 			/* strip trailing whitespaces if we have not done so already */
 			if ((type == 2 && buf != b) || type != 2) {
 				l = bufl;
-				while (l >= 1 && l-- && isspace(((unsigned char *)buf)[l]));
+				while (l-- > 0 && isspace(((unsigned char *)buf)[l]));
 				if (l != (bufl - 1)) {
 					bufl = l + 1;
 					buf[bufl] = '\0';
diff --git a/ext/standard/tests/general_functions/bug70018.phpt b/ext/standard/tests/general_functions/bug70018.phpt
@@ -0,0 +1,15 @@
+--TEST--
+Bug #70018 (exec does not strip all whitespace)
+--FILE--
+<?php
+$output = array();
+exec('/bin/echo -n -e "abc\f\n \n"',$output);
+var_dump($output);
+?>
+--EXPECT--
+array(2) {
+  [0]=>
+  string(3) "abc"
+  [1]=>
+  string(0) ""
+}
