diff options
| author | Xinchen Hui <laruence@gmail.com> | 2017-11-13 11:13:42 +0800 |
|---|---|---|
| committer | Xinchen Hui <laruence@gmail.com> | 2017-11-13 11:13:42 +0800 |
| commit | bc38c067520310ca79f750658b7b99b27e3890d6 (patch) | |
| tree | e94397dfdf168bbe4582580cbc9704ceeb987b90 /ext/standard/file.c | |
| parent | 1426be105416918492388aa51ed1cfbb9492633f (diff) | |
| parent | 1c1df0d9370fa5a14644850f09a7f9377bfc83be (diff) | |
| download | php-git-bc38c067520310ca79f750658b7b99b27e3890d6.tar.gz | |
Merge branch 'PHP-7.1' into PHP-7.2
* PHP-7.1:
Fixed bug #75511 (fread not free unused buffer)
Diffstat (limited to 'ext/standard/file.c')
| -rw-r--r-- | ext/standard/file.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/ext/standard/file.c b/ext/standard/file.c index d82c2c513e..ff9acd9501 100644 --- a/ext/standard/file.c +++ b/ext/standard/file.c @@ -1815,6 +1815,10 @@ PHPAPI PHP_FUNCTION(fread) /* needed because recv/read/gzread doesnt put a null at the end*/ Z_STRVAL_P(return_value)[Z_STRLEN_P(return_value)] = 0; + + if (len > Z_STRLEN_P(return_value) * 2) { + Z_STR_P(return_value) = zend_string_truncate(Z_STR_P(return_value), Z_STRLEN_P(return_value), 0); + } } /* }}} */ |