archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-16 05:58:45 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Fix #80048: Bug #69100 has not been fixed for Windows

Browse source 
We fix the erroneous length calculation on Windows, too.

Closes GH-6067.
This commit is contained in:
Christoph M. Becker 2020-09-03 14:27:45 +02:00
parent c70a938f28
commit 1848ccdae2
2 changed files with 7 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

3
NEWS
View file

@ -2,6 +2,9 @@ PHP NEWS
||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||| |||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
?? ??? ????, PHP 7.3.23 ?? ??? ????, PHP 7.3.23
- Core:
. Fixed bug #80048 (Bug #69100 has not been fixed for Windows). (cmb)
- Calendar: - Calendar:
. Fixed bug #80007 (Potential type confusion in unixtojd() parameter parsing). . Fixed bug #80007 (Potential type confusion in unixtojd() parameter parsing).
(Andy Postnikov) (Andy Postnikov)

12
main/streams/plain_wrapper.c
View file

@ -786,15 +786,11 @@ static int php_stdiop_set_option(php_stream *stream, int option, int value, void
} }
size = GetFileSize(hfile, NULL); size = GetFileSize(hfile, NULL);
if (range->length == 0 && range->offset > 0 && range->offset < size) { if (range->offset > size) {
range->length = size - range->offset;
}
if (range->length == 0 || range->length > size) {
range->length = size;
}
if (range->offset >= size) {
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 */ /* figure out how big a chunk to map to be able to view the part that we need */