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

Merge branch 'PHP-8.3' into PHP-8.4

Browse Source 
* PHP-8.3:
  Fix memory leak in intl_datetime_decompose()
This commit is contained in:
Niels Dossche
2025-05-24 14:56:04 +02:00
parent c00d7e056a d6836fb345
commit 7efe96d504
2 changed files with 4 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
NEWS
View File

@@ -2,6 +2,9 @@ PHP NEWS
||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||| |||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
?? ??? ????, PHP 8.4.9 ?? ??? ????, PHP 8.4.9
- Intl:
. Fix memory leak in intl_datetime_decompose() on failure. (nielsdos)
- Phar: - Phar:
. Add missing filter cleanups on phar failure. (nielsdos) . Add missing filter cleanups on phar failure. (nielsdos)

1
ext/intl/common/common_date.cpp
View File

@@ -118,6 +118,7 @@ U_CFUNC int intl_datetime_decompose(zval *z, double *millis, TimeZone **tz,
ZVAL_STRING(&zfuncname, "getTimestamp"); ZVAL_STRING(&zfuncname, "getTimestamp");
if (call_user_function(NULL, z, &zfuncname, &retval, 0, NULL) if (call_user_function(NULL, z, &zfuncname, &retval, 0, NULL)
!= SUCCESS || Z_TYPE(retval) != IS_LONG) { != SUCCESS || Z_TYPE(retval) != IS_LONG) {
zval_ptr_dtor(&retval);
spprintf(&message, 0, "%s: error calling ::getTimeStamp() on the " spprintf(&message, 0, "%s: error calling ::getTimeStamp() on the "
"object", func); "object", func);
intl_errors_set(err, U_INTERNAL_PROGRAM_ERROR, intl_errors_set(err, U_INTERNAL_PROGRAM_ERROR,