diff options
| author | Christoph M. Becker <cmbecker69@gmx.de> | 2020-09-03 15:46:30 +0200 |
|---|---|---|
| committer | Christoph M. Becker <cmbecker69@gmx.de> | 2020-09-03 15:46:30 +0200 |
| commit | c7cba01b889c657544073746c313bc559d6cf5bb (patch) | |
| tree | a86ec11cb0b035efe35c5572e32cd1152fb95c02 /main | |
| parent | 5fdabeb9695d008afcc967bd6e0c60e889fa6883 (diff) | |
| parent | 2f4a2a9316e9ca47aa7be9e18979b0bf68b8ef02 (diff) | |
| download | php-git-c7cba01b889c657544073746c313bc559d6cf5bb.tar.gz | |
Merge branch 'PHP-7.4' into master
* PHP-7.4:
Fix #80048: Bug #69100 has not been fixed for Windows
Diffstat (limited to 'main')
| -rw-r--r-- | main/streams/plain_wrapper.c | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/main/streams/plain_wrapper.c b/main/streams/plain_wrapper.c index b6db92ddad..350dc2ec40 100644 --- a/main/streams/plain_wrapper.c +++ b/main/streams/plain_wrapper.c @@ -811,15 +811,11 @@ static int php_stdiop_set_option(php_stream *stream, int option, int value, void } size = GetFileSize(hfile, NULL); - if (range->length == 0 && range->offset > 0 && range->offset < size) { - range->length = size - range->offset; - } - if (range->length == 0 || range->length > size) { - range->length = size; - } - if (range->offset >= size) { + if (range->offset > size) { range->offset = size; - range->length = 0; + } + if (range->length == 0 || range->length > size - range->offset) { + range->length = size - range->offset; } /* figure out how big a chunk to map to be able to view the part that we need */ |