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 #81659: stream_get_contents() may unnecessarily overallocate

Browse source 
Since we're going to read from the current stream position anyway, the
`max_len` should be the size of the file minus the current position
(still catering to potentially filtered streams).  We must, however,
make sure to cater to the file position being beyond the actual file
size.

While we're at, we also fix the step size in the comment, which is 8K.

A further optimization could be done for unfiltered streams, thus
saving that step size, but 8K might not be worth it.

Closes GH-7693.
This commit is contained in:
Christoph M. Becker 2021-11-26 13:44:36 +01:00
parent c2d6d837ca
commit 31749aac62
No known key found for this signature in database
GPG key ID: D66C9593118BCCB6
3 changed files with 28 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

4
main/streams/streams.c
View file

@ -1502,9 +1502,9 @@ PHPAPI zend_string *_php_stream_copy_to_mem(php_stream *src, size_t maxlen, int
* result may be inaccurate, as the filter may inflate or deflate the
* number of bytes that we can read. In order to avoid an upsize followed
* by a downsize of the buffer, overestimate by the step size (which is
* 2K). */
* 8K). */
if (php_stream_stat(src, &ssbuf) == 0 && ssbuf.sb.st_size > 0) {
max_len = ssbuf.sb.st_size + step;
max_len = MAX(ssbuf.sb.st_size - src->position, 0) + step;
} else {
max_len = step;
}