php/archived-php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2026-03-24 00:02:20 +01:00
Code Issues Packages Projects Releases Wiki Activity

ext/intl: c++ memory management application to timezone class internals. (#19184)

Browse Source
This commit is contained in:
David CARLIER
2025-07-22 05:35:44 +01:00
committed by GitHub
parent 113eb203b0
commit a7fef37657
2 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
ext/intl/timezone/timezone_class.cpp
View File

@@ -133,7 +133,7 @@ U_CFUNC TimeZone *timezone_process_timezone_argument(zval *zv_timezone,
const char *func) const char *func)
{ {
zval local_zv_tz; zval local_zv_tz;
TimeZone *timeZone; std::unique_ptr<TimeZone> timeZone;
if (zv_timezone == NULL || Z_TYPE_P(zv_timezone) == IS_NULL) { if (zv_timezone == NULL || Z_TYPE_P(zv_timezone) == IS_NULL) {
timelib_tzinfo *tzinfo = get_timezone_info(); timelib_tzinfo *tzinfo = get_timezone_info();
@@ -153,7 +153,7 @@ U_CFUNC TimeZone *timezone_process_timezone_argument(zval *zv_timezone,
zval_ptr_dtor_str(&local_zv_tz); zval_ptr_dtor_str(&local_zv_tz);
return NULL; return NULL;
} }
timeZone = to->utimezone->clone(); timeZone = std::unique_ptr<TimeZone>(to->utimezone->clone());
if (UNEXPECTED(timeZone == NULL)) { if (UNEXPECTED(timeZone == NULL)) {
zend_throw_error(IntlException_ce_ptr, "%s: could not clone TimeZone", func); zend_throw_error(IntlException_ce_ptr, "%s: could not clone TimeZone", func);
zval_ptr_dtor_str(&local_zv_tz); zval_ptr_dtor_str(&local_zv_tz);
@@ -181,7 +181,7 @@ U_CFUNC TimeZone *timezone_process_timezone_argument(zval *zv_timezone,
zval_ptr_dtor_str(&local_zv_tz); zval_ptr_dtor_str(&local_zv_tz);
return NULL; return NULL;
} }
timeZone = TimeZone::createTimeZone(id); timeZone = std::unique_ptr<TimeZone>(TimeZone::createTimeZone(id));
if (UNEXPECTED(timeZone == NULL)) { if (UNEXPECTED(timeZone == NULL)) {
zend_throw_error(IntlException_ce_ptr, "%s: Could not create time zone", func); zend_throw_error(IntlException_ce_ptr, "%s: Could not create time zone", func);
zval_ptr_dtor_str(&local_zv_tz); zval_ptr_dtor_str(&local_zv_tz);
@@ -191,14 +191,14 @@ U_CFUNC TimeZone *timezone_process_timezone_argument(zval *zv_timezone,
zend_throw_error(IntlException_ce_ptr, "%s: No such time zone: '%s'", zend_throw_error(IntlException_ce_ptr, "%s: No such time zone: '%s'",
func, Z_STRVAL_P(zv_timezone)); func, Z_STRVAL_P(zv_timezone));
zval_ptr_dtor_str(&local_zv_tz); zval_ptr_dtor_str(&local_zv_tz);
delete timeZone;
return NULL; return NULL;
} }
} }
zval_ptr_dtor_str(&local_zv_tz); zval_ptr_dtor_str(&local_zv_tz);
return timeZone; // well, this is included by the centralized C intl part so the "smart" part can't go further
return timeZone.release();
} }
/* }}} */ /* }}} */

2
ext/intl/timezone/timezone_class.h
View File

@@ -36,6 +36,8 @@ typedef struct {
intl_error err; intl_error err;
// ICU TimeZone // ICU TimeZone
// TODO?: a direct change isn't possible due to C inclusion (also it s a const)
// but see later it can be made possible through different ICU class usages
const TimeZone *utimezone; const TimeZone *utimezone;
//whether to delete the timezone on object free //whether to delete the timezone on object free