Skip to content

ext/intl: report argument #3 ($variant) for an invalid IDNA variant #23533

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
devnexen merged 2 commits into from
Sep 2, 2026
+12 −3
Merged

ext/intl: report argument #3 ($variant) for an invalid IDNA variant #23533

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
efdfba4
ext/intl: report argument #3 ($variant) for an invalid IDNA variant
lacatoire Aug 18, 2026
6267d42
ext/intl: fix the format specifier in the domain length error
lacatoire Sep 2, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions ext/intl/idn/idn.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -122,11 +122,11 @@ static void php_intl_idn_handoff(INTERNAL_FUNCTION_PARAMETERS, int mode)
RETURN_THROWS();
}
if (UNEXPECTED(ZSTR_LEN(domain) > INT32_MAX - 1)) {
zend_argument_value_error(1, "must be less than " PRId32 " bytes", INT32_MAX);
zend_argument_value_error(1, "must be less than %" PRId32 " bytes", INT32_MAX);
RETURN_THROWS();
}
if (variant != INTL_IDN_VARIANT_UTS46) {
zend_argument_value_error(2, "must be INTL_IDNA_VARIANT_UTS46");
zend_argument_value_error(3, "must be INTL_IDNA_VARIANT_UTS46");
RETURN_THROWS();
}
/* don't check options; it wasn't checked before */
Expand Down
11 changes: 10 additions & 1 deletion ext/intl/tests/idn_uts46_errors.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,13 @@ try {
echo $e::class, ': ', $e->getMessage(), PHP_EOL;
}

echo "bad variant, named argument:", "\n";
try {
var_dump(idn_to_utf8("xn--fuball-cta.com", variant: INTL_IDNA_VARIANT_UTS46 + 10));
} catch (Throwable $e) {
echo $e::class, ': ', $e->getMessage(), PHP_EOL;
}

echo "empty domain:", "\n";
try {
var_dump(idn_to_ascii("", 0, INTL_IDNA_VARIANT_UTS46));
Expand Down Expand Up @@ -45,7 +52,9 @@ var_dump($foo["errors"]==IDNA_ERROR_CONTEXTJ);
--EXPECT--
=> PHP level errors
bad variant:
ValueError: idn_to_ascii(): Argument #2 ($flags) must be INTL_IDNA_VARIANT_UTS46
ValueError: idn_to_ascii(): Argument #3 ($variant) must be INTL_IDNA_VARIANT_UTS46
bad variant, named argument:
ValueError: idn_to_utf8(): Argument #3 ($variant) must be INTL_IDNA_VARIANT_UTS46
empty domain:
ValueError: idn_to_ascii(): Argument #1 ($domain) must not be empty
with error, but no details arg:
Expand Down
Loading