archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-15 21:48:51 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Merge branch 'PHP-8.0' into PHP-8.1

Browse source 
* PHP-8.0:
  Fix #81659: stream_get_contents() may unnecessarily overallocate
This commit is contained in:
Christoph M. Becker 2021-11-29 14:49:55 +01:00
commit b0823438a9
No known key found for this signature in database
GPG key ID: D66C9593118BCCB6
3 changed files with 30 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

4
main/streams/streams.c
View file

@ -1504,9 +1504,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;
}