From: Pierre Joye <pajoye@php.net>
Date: Thu, 15 Oct 2009 21:36:42 +0000 (+0000)
Subject: - Merge: #49847
X-Git-Tag: php-5.3.1RC2~13
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=60926976a151bfa82e2564335813a7d1b85cc33b;p=php

- Merge: #49847
---

diff --git a/ext/standard/exec.c b/ext/standard/exec.c
index 65fe95115f..a460357ed2 100644
--- a/ext/standard/exec.c
+++ b/ext/standard/exec.c
@@ -62,7 +62,7 @@ PHPAPI int php_exec(int type, char *cmd, zval *array, zval *return_value TSRMLS_
 {
 	FILE *fp;
 	char *buf, *tmp=NULL;
-	int l, pclose_return;
+	int l = 0, pclose_return;
 	char *cmd_p, *b, *c, *d=NULL;
 	php_stream *stream;
 	size_t buflen, bufl = 0;
@@ -157,13 +157,16 @@ PHPAPI int php_exec(int type, char *cmd, zval *array, zval *return_value TSRMLS_
 		}
 		if (bufl) {
 			/* strip trailing whitespaces if we have not done so already */
-			if (type != 2) {
+			if ((type == 2 && bufl && !l) || type != 2) {
 				l = bufl;
 				while (l-- && isspace(((unsigned char *)buf)[l]));
 				if (l != (int)(bufl - 1)) {
 					bufl = l + 1;
 					buf[bufl] = '\0';
 				}
+				if (type == 2) {
+					add_next_index_stringl(array, buf, bufl, 1);
+				}
 			}
 
 			/* Return last line from the shell command */