Skip to content

Commit 2f4a2a9

Browse files
committed
Merge branch 'PHP-7.3' into PHP-7.4
* PHP-7.3: Fix #80048: Bug #69100 has not been fixed for Windows
2 parents 8516434 + 1848ccd commit 2f4a2a9

File tree

2 files changed

+5
-8
lines changed

2 files changed

+5
-8
lines changed

NEWS

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ PHP NEWS
77
Nikita)
88
. Fixed bug #80037 (Typed property must not be accessed before initialization
99
when __get() declared). (Nikita)
10+
. Fixed bug #80048 (Bug #69100 has not been fixed for Windows). (cmb)
1011

1112
- Calendar:
1213
. Fixed bug #80007 (Potential type confusion in unixtojd() parameter parsing).

main/streams/plain_wrapper.c

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

810810
size = GetFileSize(hfile, NULL);
811-
if (range->length == 0 && range->offset > 0 && range->offset < size) {
812-
range->length = size - range->offset;
813-
}
814-
if (range->length == 0 || range->length > size) {
815-
range->length = size;
816-
}
817-
if (range->offset >= size) {
811+
if (range->offset > size) {
818812
range->offset = size;
819-
range->length = 0;
813+
}
814+
if (range->length == 0 || range->length > size - range->offset) {
815+
range->length = size - range->offset;
820816
}
821817

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

0 commit comments

Comments
 (0)