Merge branch 'PHP-7.1' into PHP-7.2

laruence · laruence · commit 2d88b2a1ea52 · 2017-11-13T11:19:42.000+08:00
* PHP-7.1:
  Avoid overflow
diff --git 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);
 	}
 }

Original file line number	Diff line number	Diff line change
`@@ -1816,7 +1816,7 @@ PHPAPI PHP_FUNCTION(fread)`
`1816`	`1816`	`/* needed because recv/read/gzread doesnt put a null at the end*/`
`1817`	`1817`	`Z_STRVAL_P(return_value)[Z_STRLEN_P(return_value)] = 0;`
`1818`	`1818`
`1819`		`- if (len > Z_STRLEN_P(return_value) * 2) {`
	`1819`	`+ if (Z_STRLEN_P(return_value) < len / 2) {`
`1820`	`1820`	`Z_STR_P(return_value) = zend_string_truncate(Z_STR_P(return_value), Z_STRLEN_P(return_value), 0);`
`1821`	`1821`	`}`
`1822`	`1822`	`}`