Skip to content

Commit c7cba01

Browse files
committed
Merge branch 'PHP-7.4' into master
* PHP-7.4: Fix #80048: Bug #69100 has not been fixed for Windows
2 parents 5fdabeb + 2f4a2a9 commit c7cba01

File tree

1 file changed

+4
-8
lines changed

1 file changed

+4
-8
lines changed

main/streams/plain_wrapper.c

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -811,15 +811,11 @@ static int php_stdiop_set_option(php_stream *stream, int option, int value, void
811811
}
812812

813813
size = GetFileSize(hfile, NULL);
814-
if (range->length == 0 && range->offset > 0 && range->offset < size) {
815-
range->length = size - range->offset;
816-
}
817-
if (range->length == 0 || range->length > size) {
818-
range->length = size;
819-
}
820-
if (range->offset >= size) {
814+
if (range->offset > size) {
821815
range->offset = size;
822-
range->length = 0;
816+
}
817+
if (range->length == 0 || range->length > size - range->offset) {
818+
range->length = size - range->offset;
823819
}
824820

825821
/* figure out how big a chunk to map to be able to view the part that we need */

0 commit comments

Comments
 (0)