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

Add missing return for DatePeriod::__unserialize

Browse Source 
Additionally, add other RETURN_THROWS() defensively.
This commit is contained in:
Máté Kocsis
2024-08-28 22:35:58 +02:00
parent 1e78cf941c
commit 6cab76986d
1 changed files with 8 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
ext/date/php_date.c
View File

@@ -2905,6 +2905,7 @@ PHP_METHOD(DateTime, __wakeup)
if (!php_date_initialize_from_hash(&dateobj, myht)) {
zend_throw_error(NULL, "Invalid serialization data for DateTime object");
RETURN_THROWS();
}
}
/* }}} */
@@ -2924,6 +2925,7 @@ PHP_METHOD(DateTimeImmutable, __wakeup)
if (!php_date_initialize_from_hash(&dateobj, myht)) {
zend_throw_error(NULL, "Invalid serialization data for DateTimeImmutable object");
RETURN_THROWS();
}
}
/* }}} */
@@ -3815,6 +3817,7 @@ PHP_METHOD(DateTimeZone, __set_state)
if (!php_date_timezone_initialize_from_hash(&return_value, &tzobj, myht)) {
zend_throw_error(NULL, "Timezone initialization failed");
zval_ptr_dtor(return_value);
RETURN_THROWS();
}
}
/* }}} */
@@ -3834,6 +3837,7 @@ PHP_METHOD(DateTimeZone, __wakeup)
if (!php_date_timezone_initialize_from_hash(&return_value, &tzobj, myht)) {
zend_throw_error(NULL, "Timezone initialization failed");
RETURN_THROWS();
}
}
/* }}} */
@@ -3899,6 +3903,7 @@ PHP_METHOD(DateTimeZone, __unserialize)
if (!php_date_timezone_initialize_from_hash(&object, &tzobj, myht)) {
zend_throw_error(NULL, "Invalid serialization data for DateTimeZone object");
RETURN_THROWS();
}
restore_custom_datetimezone_properties(object, myht);
@@ -5440,6 +5445,7 @@ PHP_METHOD(DatePeriod, __set_state)
period_obj = Z_PHPPERIOD_P(return_value);
if (!php_date_period_initialize_from_hash(period_obj, myht)) {
zend_throw_error(NULL, "Invalid serialization data for DatePeriod object");
RETURN_THROWS();
}
}
/* }}} */
@@ -5515,6 +5521,7 @@ PHP_METHOD(DatePeriod, __unserialize)
if (!php_date_period_initialize_from_hash(period_obj, myht)) {
zend_throw_error(NULL, "Invalid serialization data for DatePeriod object");
RETURN_THROWS();
}
restore_custom_dateperiod_properties(object, myht);
}
@@ -5535,6 +5542,7 @@ PHP_METHOD(DatePeriod, __wakeup)
if (!php_date_period_initialize_from_hash(period_obj, myht)) {
zend_throw_error(NULL, "Invalid serialization data for DatePeriod object");
RETURN_THROWS();
}
}
/* }}} */