Merge branch 'PHP-8.0' into PHP-8.1

* PHP-8.0:
  Fix signedness confusion in php_filter_validate_domain()
This commit is contained in:
Christoph M. Becker 2022-03-28 14:02:14 +02:00
commit 1c3374c785
No known key found for this signature in database
GPG key ID: D66C9593118BCCB6
2 changed files with 4 additions and 1 deletions

3
NEWS
View file

@ -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)

View file

@ -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;