Skip to content

[intl] Fix leak of time zone wrapper in Calendar debug info #23503

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

Closed
iliaal wants to merge 1 commit into from
+29 −0
Closed

[intl] Fix leak of time zone wrapper in Calendar debug info #23503

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
1 change: 1 addition & 0 deletions NEWS
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@ PHP NEWS
. Fixed bug GH-19320 (FPM UID and GID overflow). (Pratik Bhujel)

- Intl:
. Fixed a memory leak when dumping IntlCalendar instances. (iliaal)
. Fixed a memory leak when iterating IntlBreakIterator::getPartsIterator()
results. (iliaal)
. Fixed a double-free when IntlGregorianCalendar construction fails after
Expand Down
2 changes: 2 additions & 0 deletions ext/intl/calendar/calendar_class.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -171,6 +171,8 @@ static HashTable *Calendar_get_debug_info(zend_object *object, int *is_temp)
FREE_HASHTABLE(debug_info_tz);

zend_hash_str_update(debug_info, "timeZone", sizeof("timeZone") - 1, &ztz_debug);

zval_ptr_dtor(&ztz);
}

{
Expand Down
26 changes: 26 additions & 0 deletions ext/intl/tests/calendar_get_debug_info_tz_leak.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
--TEST--
IntlCalendar get_debug_info() must not leak the time zone wrapper object
--EXTENSIONS--
intl
--FILE--
<?php
$cal = IntlCalendar::createInstance('UTC');
ob_start();
var_dump($cal);
ob_end_clean();

$o = new stdClass;
$before = spl_object_id($o);
unset($o);
for ($i = 0; $i < 10; $i++) {
ob_start();
var_dump($cal);
ob_end_clean();
}
$o = new stdClass;
$after = spl_object_id($o);

var_dump($after - $before);
?>
--EXPECT--
int(0)
Loading