Browse Source

- Fixed bug #26615 (patch by runekl at opoint dot com)

PEAR_1_4DEV
Derick Rethans 23 years ago
parent
commit
112f424f70
  1. 1
      NEWS
  2. 2
      ext/standard/exec.c
  3. 16
      ext/standard/tests/file/bug26615.phpt

1
NEWS

@ -33,6 +33,7 @@ PHP NEWS
of files. (Andi) of files. (Andi)
- Fixed get_declared_classes() to return only classes. (Andrey, Marcus) - Fixed get_declared_classes() to return only classes. (Andrey, Marcus)
- Fixed __autoload() to preserve case of the passed class name. (Andi) - Fixed __autoload() to preserve case of the passed class name. (Andi)
- Fixed bug #26615 () (runekl at opoint dot com, Derick)
- Fixed bug #26591 ("__autoload threw an exception" during an uncaught). - Fixed bug #26591 ("__autoload threw an exception" during an uncaught).
(Marcus) (Marcus)
- Fixed bug #26534 (stream_get_meta_data() -> Access Violation). (Wez) - Fixed bug #26534 (stream_get_meta_data() -> Access Violation). (Wez)

2
ext/standard/exec.c

@ -115,7 +115,7 @@ int php_exec(int type, char *cmd, pval *array, pval *return_value TSRMLS_DC)
while (php_stream_get_line(stream, b, EXEC_INPUT_BUF, &bufl)) { while (php_stream_get_line(stream, b, EXEC_INPUT_BUF, &bufl)) {
/* no new line found, let's read some more */ /* no new line found, let's read some more */
if (b[bufl - 1] != '\n' && !php_stream_eof(stream)) { if (b[bufl - 1] != '\n' && !php_stream_eof(stream)) {
if (buflen < (bufl + EXEC_INPUT_BUF)) {
if (buflen < (bufl + (b - buf) + EXEC_INPUT_BUF)) {
bufl += b - buf; bufl += b - buf;
buflen = bufl + EXEC_INPUT_BUF; buflen = bufl + EXEC_INPUT_BUF;
buf = erealloc(buf, buflen); buf = erealloc(buf, buflen);

16
ext/standard/tests/file/bug26615.phpt
File diff suppressed because it is too large
View File

Loading…
Cancel
Save