diff options
| author | Xinchen Hui <laruence@gmail.com> | 2017-11-13 11:19:42 +0800 |
|---|---|---|
| committer | Xinchen Hui <laruence@gmail.com> | 2017-11-13 11:19:42 +0800 |
| commit | 2d88b2a1ea52bb86b6a95dfef95df8be61416023 (patch) | |
| tree | 02f498dca450a5c025e674a890889690b7abf9d2 | |
| parent | 1ab03bc3169fce259f1485360755f08f72d3b00f (diff) | |
| parent | c718fd16a1ce0def93641fd3539357526a11fc16 (diff) | |
| download | php-git-2d88b2a1ea52bb86b6a95dfef95df8be61416023.tar.gz | |
Merge branch 'PHP-7.1' into PHP-7.2
* PHP-7.1:
Avoid overflow
| -rw-r--r-- | ext/standard/file.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/ext/standard/file.c b/ext/standard/file.c index ff9acd9501..5a1b3b955c 100644 --- a/ext/standard/file.c +++ b/ext/standard/file.c @@ -1816,7 +1816,7 @@ 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) { + if (Z_STRLEN_P(return_value) < len / 2) { Z_STR_P(return_value) = zend_string_truncate(Z_STR_P(return_value), Z_STRLEN_P(return_value), 0); } } |