Merge branch 'PHP-7.3' into PHP-7.4

nikic · nikic · commit f2833ca1be8a · 2020-12-02T11:29:06.000+01:00
* PHP-7.3:
  Fixed bug #80457
diff --git a/ext/standard/streamsfuncs.c b/ext/standard/streamsfuncs.c
@@ -429,7 +429,7 @@ PHP_FUNCTION(stream_get_contents)
 		Z_PARAM_LONG(desiredpos)
 	ZEND_PARSE_PARAMETERS_END_EX(RETURN_FALSE);
 
-	if (maxlen < 0 && maxlen != PHP_STREAM_COPY_ALL) {
+	if (maxlen < 0 && maxlen != (ssize_t)PHP_STREAM_COPY_ALL) {
 		php_error_docref(NULL, E_WARNING, "Length must be greater than or equal to zero, or -1");
 		RETURN_FALSE;
 	}

Original file line number	Diff line number	Diff line change
`@@ -429,7 +429,7 @@ PHP_FUNCTION(stream_get_contents)`
`429`	`429`	`Z_PARAM_LONG(desiredpos)`
`430`	`430`	`ZEND_PARSE_PARAMETERS_END_EX(RETURN_FALSE);`
`431`	`431`
`432`		`- if (maxlen < 0 && maxlen != PHP_STREAM_COPY_ALL) {`
	`432`	`+ if (maxlen < 0 && maxlen != (ssize_t)PHP_STREAM_COPY_ALL) {`
`433`	`433`	`php_error_docref(NULL, E_WARNING, "Length must be greater than or equal to zero, or -1");`
`434`	`434`	`RETURN_FALSE;`
`435`	`435`	`}`