diff options
| author | Tjerk Meesters <datibbaw@php.net> | 2014-03-07 19:24:02 +0800 |
|---|---|---|
| committer | Tjerk Meesters <datibbaw@php.net> | 2014-03-07 19:24:02 +0800 |
| commit | 8d3f4b647b0942273f477e5b7e1f3d5d26dc4e0d (patch) | |
| tree | 1a65aa500055766b7163d5644bad74eeb8ec378b | |
| parent | 25d355bdb7ea258c5ddf17ce5aba0af5f15697c6 (diff) | |
| parent | 972935cd957ed626fcdb66f0e770ae6c429156d4 (diff) | |
| download | php-git-8d3f4b647b0942273f477e5b7e1f3d5d26dc4e0d.tar.gz | |
Merge branch 'PHP-5.5' into PHP-5.6
| -rw-r--r-- | ext/spl/spl_directory.c | 3 | ||||
| -rw-r--r-- | ext/spl/tests/bug65545.phpt | 5 |
2 files changed, 7 insertions, 1 deletions
diff --git a/ext/spl/spl_directory.c b/ext/spl/spl_directory.c index fe253aaf39..03315b7bb1 100644 --- a/ext/spl/spl_directory.c +++ b/ext/spl/spl_directory.c @@ -2865,7 +2865,8 @@ SPL_METHOD(SplFileObject, fread) Z_STRVAL_P(return_value) = emalloc(length + 1); Z_STRLEN_P(return_value) = php_stream_read(intern->u.file.stream, Z_STRVAL_P(return_value), length); - Z_STRVAL_P(return_value)[length] = 0; + /* needed because recv/read/gzread doesnt put a null at the end*/ + Z_STRVAL_P(return_value)[Z_STRLEN_P(return_value)] = 0; Z_TYPE_P(return_value) = IS_STRING; } diff --git a/ext/spl/tests/bug65545.phpt b/ext/spl/tests/bug65545.phpt index b43f10f6e6..76c29cbf48 100644 --- a/ext/spl/tests/bug65545.phpt +++ b/ext/spl/tests/bug65545.phpt @@ -12,6 +12,10 @@ var_dump($data); $data = $obj->fread(0); var_dump($data); +// read more data than is available +$data = $obj->fread(filesize(__FILE__) + 32); +var_dump(strlen($data) === filesize(__FILE__) - 5); + ?> --EXPECTF-- string(5) "<?php" @@ -21,3 +25,4 @@ NULL Warning: SplFileObject::fread(): Length parameter must be greater than 0 in %s on line %d bool(false) +bool(true) |