Merge branch 'PHP-8.0' into PHP-8.1

cmb69 · cmb69 · commit 1c3374c7855f · 2022-03-28T14:02:32.000+02:00
* PHP-8.0:
  Fix signedness confusion in php_filter_validate_domain()
diff --git a/NEWS b/NEWS
@@ -9,6 +9,9 @@ PHP                                                                        NEWS
     (Tim Düsterhus)
   . Fixed bug GH-8160 (ZTS support on Alpine is broken). (Michael Voříšek)
 
+- Filter:
+  . Fixed signedness confusion in php_filter_validate_domain(). (cmb)
+
 - Intl:
   . Fixed bug GH-8115 (Can't catch arg type deprecation when instantiating Intl
     classes). (ilutov)
diff --git a/ext/filter/logical_filters.c b/ext/filter/logical_filters.c
@@ -504,7 +504,7 @@ void php_filter_validate_regexp(PHP_INPUT_FILTER_PARAM_DECL) /* {{{ */
 	}
 }
 
-static int _php_filter_validate_domain(char * domain, int len, zend_long flags) /* {{{ */
+static int _php_filter_validate_domain(char * domain, size_t len, zend_long flags) /* {{{ */
 {
 	char *e, *s, *t;
 	size_t l;

Original file line number	Diff line number	Diff line change
`@@ -504,7 +504,7 @@ void php_filter_validate_regexp(PHP_INPUT_FILTER_PARAM_DECL) /* {{{ */`
`504`	`504`	`}`
`505`	`505`	`}`
`506`	`506`
`507`		`-static int _php_filter_validate_domain(char * domain, int len, zend_long flags) /* {{{ */`
	`507`	`+static int _php_filter_validate_domain(char * domain, size_t len, zend_long flags) /* {{{ */`
`508`	`508`	`{`
`509`	`509`	`char e, s, *t;`
`510`	`510`	`size_t l;`