Merge branch 'PHP-7.1' into PHP-7.2

laruence · laruence · commit bc38c0675203 · 2017-11-13T11:13:42.000+08:00
* PHP-7.1:
  Fixed bug #75511 (fread not free unused buffer)
diff --git 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);
+	}
 }
 /* }}} */
 

Original file line number	Diff line number	Diff line change
`@@ -1815,6 +1815,10 @@ PHPAPI PHP_FUNCTION(fread)`
`1815`	`1815`
`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`	`+`
	`1819`	`+ if (len > Z_STRLEN_P(return_value) * 2) {`
	`1820`	`+ Z_STR_P(return_value) = zend_string_truncate(Z_STR_P(return_value), Z_STRLEN_P(return_value), 0);`
	`1821`	`+ }`
`1818`	`1822`	`}`
`1819`	`1823`	`/* }}} */`
`1820`	`1824`