Skip to content

Fix Calendar::createInstance double-free of the adopted TimeZone #23320

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

Open
iliaal wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fix Calendar::createInstance double-free of the adopted TimeZone #23320

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 2 additions & 0 deletions NEWS
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,8 @@ PHP NEWS
- Intl:
. Fixed grapheme_strrev() treating UBRK_DONE as a byte index and leaving
the result without a terminating NUL. (iliaal)
. Fixed a double-free when Calendar::createInstance() or
IntlCalendar::fromDateTime() fails after adopting a TimeZone. (iliaal)

- Phar:
. Fixed Phar archives being automatically detected when ".phar" only occurs
Expand Down
2 changes: 0 additions & 2 deletions ext/intl/calendar/calendar_methods.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,6 @@ PHP_INTL_FUNCTION_WITH_ERROR_RESET(intlcal_create_instance)
Calendar *cal = Calendar::createInstance(timeZone,
Locale::createFromName(locale_str), status);
if (UNEXPECTED(cal == NULL)) {
delete timeZone;
intl_error_set(NULL, status, "Error creating ICU Calendar object");
RETURN_NULL();
}
Expand Down Expand Up @@ -1073,7 +1072,6 @@ PHP_INTL_FUNCTION_WITH_ERROR_RESET(intlcal_from_date_time)
cal = Calendar::createInstance(timeZone,
Locale::createFromName(locale_str), status);
if (UNEXPECTED(cal == NULL)) {
delete timeZone;
intl_error_set(NULL, status,
"error creating ICU Calendar object");
goto error;
Expand Down
Loading