diff options
| author | Xinchen Hui <laruence@gmail.com> | 2017-11-13 11:14:10 +0800 |
|---|---|---|
| committer | Xinchen Hui <laruence@gmail.com> | 2017-11-13 11:14:10 +0800 |
| commit | 46a21c5173c7d2162cfa09e8698fb180a203bdfa (patch) | |
| tree | 9e7508c2f53ac262f5389b0f44b6850cb0f0a088 /ext/standard/file.c | |
| parent | a0ed09f92b66a86de4cbc2bd17e245f007626133 (diff) | |
| parent | 1ab03bc3169fce259f1485360755f08f72d3b00f (diff) | |
| download | php-git-46a21c5173c7d2162cfa09e8698fb180a203bdfa.tar.gz | |
Merge branch 'PHP-7.2'
* PHP-7.2:
Update NEWS
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 6e76f235e2..e8d7942461 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); + } } /* }}} */ |