]> granicus.if.org Git - php/commitdiff
When output is empty, exec should return "", not "\0" (#5775)
authorStanislav Malyshev <stas@php.net>
Tue, 1 Aug 2000 07:22:59 +0000 (07:22 +0000)
committerStanislav Malyshev <stas@php.net>
Tue, 1 Aug 2000 07:22:59 +0000 (07:22 +0000)
@- Fixed exec() returning "\0" when output is empty

ext/standard/exec.c

index 7fc6acc033430c7657476e3efd6c13abe2529b17..63409520f0e17608c203c0f965d21447f999b985 100644 (file)
@@ -172,8 +172,9 @@ static int _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+1,1);
+               } else {
+                       RETVAL_STRINGL(buf,l?l+1:0,1);
+               }
        } else {
                int b, i;