Commit b6df8227569 for php
commit b6df8227569b85b20a6c452d84bad6c7c945616f
Merge: f752eddff8a c95e5726969
Author: Máté Kocsis <kocsismate90@gmail.com>
Date: Fri Oct 30 14:56:40 2026 +0100
Merge branch 'PHP-8.5' into PHP-8.6
* PHP-8.5:
Fix GH-25019: Uri\Rfc3986\Uri rejects a port with leading zeros as out of range
diff --cc ext/uri/uri_parser_rfc3986.c
index 1a936a273ed,7fd2102b28a..75e45a8c4b5
--- a/ext/uri/uri_parser_rfc3986.c
+++ b/ext/uri/uri_parser_rfc3986.c
@@@ -383,8 -332,13 +383,13 @@@ static zend_result php_uri_parser_rfc39
}
}
-ZEND_ATTRIBUTE_NONNULL static zend_long port_str_to_zend_long_checked(const char *str, size_t len)
+ZEND_ATTRIBUTE_NONNULL static zend_long port_str_to_zend_long_checked(const char *str, const size_t len)
{
+ while (len > 1 && *str == '0') {
+ str++;
+ len--;
+ }
+
if (len > MAX_LENGTH_OF_LONG) {
return -1;
}