Close the keyword UEnumeration on Locale::getKeywords failure - #23351
Open
iliaal wants to merge 1 commit into
Open
Close the keyword UEnumeration on Locale::getKeywords failure#23351iliaal wants to merge 1 commit into
iliaal wants to merge 1 commit into
Conversation
LamentXU123
requested changes
Aug 18, 2026
Member
There was a problem hiding this comment.
I wrote a test for this case, please add it
--TEST--
Locale::getKeywords() closes the keyword enumeration on failure
--EXTENSIONS--
intl
--SKIPIF--
<?php
if (version_compare(INTL_ICU_VERSION, '59.1', '<')) {
die('skip for ICU >= 59.1');
}
?>
--FILE--
<?php
var_dump(Locale::getKeywords('en@foo=bar!'));
var_dump(intl_get_error_code() === U_ILLEGAL_ARGUMENT_ERROR);
?>
--EXPECT--
bool(false)
bool(true)
uloc_getKeywordValue failure destroyed the result array and returned without uenum_close(). Close the enumeration on that path. The success path already closes it. Audited the other uenum_close site in this file (acceptLanguage).
iliaal
force-pushed
the
fix/intl-keywords-uenum-leak
branch
from
August 18, 2026 12:21
5901e4e to
8f52ffc
Compare
Contributor
Author
|
Thanks added test, before fix leak shows up on the test via valgrind |
LamentXU123
approved these changes
Aug 18, 2026
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Locale::getKeywords() destroyed the result array and returned when uloc_getKeywordValue() failed, without uenum_close(). Close the enumeration on that path. The success path already does.