Skip to content

Commit 1848ccd

Browse files
committed
Fix #80048: Bug #69100 has not been fixed for Windows
We fix the erroneous length calculation on Windows, too. Closes GH-6067.
1 parent c70a938 commit 1848ccd

File tree

2 files changed

+7
-8
lines changed

2 files changed

+7
-8
lines changed

NEWS

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,9 @@ PHP NEWS
22
|||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
33
?? ??? ????, PHP 7.3.23
44

5+
- Core:
6+
. Fixed bug #80048 (Bug #69100 has not been fixed for Windows). (cmb)
7+
58
- Calendar:
69
. Fixed bug #80007 (Potential type confusion in unixtojd() parameter parsing).
710
(Andy Postnikov)

main/streams/plain_wrapper.c

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

788788
size = GetFileSize(hfile, NULL);
789-
if (range->length == 0 && range->offset > 0 && range->offset < size) {
790-
range->length = size - range->offset;
791-
}
792-
if (range->length == 0 || range->length > size) {
793-
range->length = size;
794-
}
795-
if (range->offset >= size) {
789+
if (range->offset > size) {
796790
range->offset = size;
797-
range->length = 0;
791+
}
792+
if (range->length == 0 || range->length > size - range->offset) {
793+
range->length = size - range->offset;
798794
}
799795

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

0 commit comments

Comments
 (0)