diff options
| author | Andrei Zmievski <andrei@php.net> | 2000-02-11 19:16:36 +0000 |
|---|---|---|
| committer | Andrei Zmievski <andrei@php.net> | 2000-02-11 19:16:36 +0000 |
| commit | 055645b079300a91701f6d907ae5f023ed0616f7 (patch) | |
| tree | dba1fc41ee24b34777f6b13b1a64813915f680fd | |
| parent | fe93919b487a480a146b5c6f16cc99dae42454a3 (diff) | |
| download | php-git-055645b079300a91701f6d907ae5f023ed0616f7.tar.gz | |
(PHP passthru) Shouldn't return anything.
This fixes bugs #3428 and #3430.
| -rw-r--r-- | ext/standard/exec.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/ext/standard/exec.c b/ext/standard/exec.c index f12e3dd557..5f009d508d 100644 --- a/ext/standard/exec.c +++ b/ext/standard/exec.c @@ -169,7 +169,7 @@ static int _Exec(int type, char *cmd, pval *array, pval *return_value) } else { int b, i; - while ((b = fread(buf, 1, sizeof(buf), fp)) > 0) { + while ((b = fread(buf, 1, buflen, fp)) > 0) { for (i = 0; i < b; i++) if (output) (void)PUTC(buf[i]); } @@ -181,8 +181,6 @@ 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_STRING(buf,1); } ret = pclose(fp); |