Merge branch 'PHP-8.0'

cmb69 · cmb69 · commit eea4aac1a026 · 2021-02-01T13:01:27.000+01:00
* PHP-8.0:
  Fix #80654: file_get_contents() maxlen fails above (2**31)-1 bytes
diff --git a/ext/standard/file.c b/ext/standard/file.c
@@ -564,10 +564,6 @@ PHP_FUNCTION(file_get_contents)
 		RETURN_FALSE;
 	}
 
-	if (maxlen > INT_MAX) {
-		php_error_docref(NULL, E_WARNING, "maxlen truncated from " ZEND_LONG_FMT " to %d bytes", maxlen, INT_MAX);
-		maxlen = INT_MAX;
-	}
 	if ((contents = php_stream_copy_to_mem(stream, maxlen, 0)) != NULL) {
 		RETVAL_STR(contents);
 	} else {
diff --git a/ext/standard/streamsfuncs.c b/ext/standard/streamsfuncs.c
@@ -458,10 +458,6 @@ PHP_FUNCTION(stream_get_contents)
 		}
 	}
 
-	if (maxlen > INT_MAX) {
-		php_error_docref(NULL, E_WARNING, "Argument #2 ($maxlength) is truncated from " ZEND_LONG_FMT " to %d bytes", maxlen, INT_MAX);
-		maxlen = INT_MAX;
-	}
 	if ((contents = php_stream_copy_to_mem(stream, maxlen, 0))) {
 		RETURN_STR(contents);
 	} else {

Original file line number	Diff line number	Diff line change
`@@ -458,10 +458,6 @@ PHP_FUNCTION(stream_get_contents)`
`458`	`458`	`}`
`459`	`459`	`}`
`460`	`460`
`461`		`- if (maxlen > INT_MAX) {`
`462`		`- php_error_docref(NULL, E_WARNING, "Argument #2 ($maxlength) is truncated from " ZEND_LONG_FMT " to %d bytes", maxlen, INT_MAX);`
`463`		`- maxlen = INT_MAX;`
`464`		`- }`
`465`	`461`	`if ((contents = php_stream_copy_to_mem(stream, maxlen, 0))) {`
`466`	`462`	`RETURN_STR(contents);`
`467`	`463`	`} else {`