- Fix for bugs #9042, #8212, and #8962. Patch from <tunacat@yahoo.com>

- Fixed proto for exec()

diff --git a/ext/standard/exec.c b/ext/standard/exec.c
index e0368e99c49ce332bb43f6cb643b1821c4fd68b5..832251fbcedbfa6e7186933549ae8c01e860bfe3 100644 (file)
--- a/ext/standard/exec.c
+++ b/ext/standard/exec.c
@@ -194,8 +194,10 @@ int php_Exec(int type, char *cmd, pval *array, pval *return_value)
                /* strip trailing spaces */
                l = strlen(buf);
                t = l;
-               while (l && isspace((int)buf[--l]));
-               if (l < t) buf[l + 1] = '\0';
+               while (l && isspace((int)buf[l - 1])) {
+                       l--;
+               }
+               if (l < t) buf[l] = '\0';
 
                /* Return last line from the shell command */
                if (PG(magic_quotes_runtime)) {
@@ -204,7 +206,7 @@ int php_Exec(int type, char *cmd, pval *array, pval *return_value)
                        tmp = php_addslashes(buf, 0, &len, 0);
                        RETVAL_STRINGL(tmp,len,0);
                } else {
-                       RETVAL_STRINGL(buf,l?l+1:0,1);
+                       RETVAL_STRINGL(buf,l,1);
                }
        } else {
                int b, i;
@@ -233,7 +235,7 @@ int php_Exec(int type, char *cmd, pval *array, pval *return_value)
        return FG(pclose_ret);
 }
 
-/* {{{ proto int exec(string command [, array output [, int return_value]])
+/* {{{ proto string exec(string command [, array output [, int return_value]])
    Execute an external program */
 PHP_FUNCTION(exec)
 {