Skip to content

Commit 6cab769

Browse files
committed
Add missing return for DatePeriod::__unserialize
Additionally, add other RETURN_THROWS() defensively.
1 parent 1e78cf9 commit 6cab769

File tree

1 file changed

+8
-0
lines changed

1 file changed

+8
-0
lines changed

ext/date/php_date.c

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2905,6 +2905,7 @@ PHP_METHOD(DateTime, __wakeup)
29052905

29062906
if (!php_date_initialize_from_hash(&dateobj, myht)) {
29072907
zend_throw_error(NULL, "Invalid serialization data for DateTime object");
2908+
RETURN_THROWS();
29082909
}
29092910
}
29102911
/* }}} */
@@ -2924,6 +2925,7 @@ PHP_METHOD(DateTimeImmutable, __wakeup)
29242925

29252926
if (!php_date_initialize_from_hash(&dateobj, myht)) {
29262927
zend_throw_error(NULL, "Invalid serialization data for DateTimeImmutable object");
2928+
RETURN_THROWS();
29272929
}
29282930
}
29292931
/* }}} */
@@ -3815,6 +3817,7 @@ PHP_METHOD(DateTimeZone, __set_state)
38153817
if (!php_date_timezone_initialize_from_hash(&return_value, &tzobj, myht)) {
38163818
zend_throw_error(NULL, "Timezone initialization failed");
38173819
zval_ptr_dtor(return_value);
3820+
RETURN_THROWS();
38183821
}
38193822
}
38203823
/* }}} */
@@ -3834,6 +3837,7 @@ PHP_METHOD(DateTimeZone, __wakeup)
38343837

38353838
if (!php_date_timezone_initialize_from_hash(&return_value, &tzobj, myht)) {
38363839
zend_throw_error(NULL, "Timezone initialization failed");
3840+
RETURN_THROWS();
38373841
}
38383842
}
38393843
/* }}} */
@@ -3899,6 +3903,7 @@ PHP_METHOD(DateTimeZone, __unserialize)
38993903

39003904
if (!php_date_timezone_initialize_from_hash(&object, &tzobj, myht)) {
39013905
zend_throw_error(NULL, "Invalid serialization data for DateTimeZone object");
3906+
RETURN_THROWS();
39023907
}
39033908

39043909
restore_custom_datetimezone_properties(object, myht);
@@ -5440,6 +5445,7 @@ PHP_METHOD(DatePeriod, __set_state)
54405445
period_obj = Z_PHPPERIOD_P(return_value);
54415446
if (!php_date_period_initialize_from_hash(period_obj, myht)) {
54425447
zend_throw_error(NULL, "Invalid serialization data for DatePeriod object");
5448+
RETURN_THROWS();
54435449
}
54445450
}
54455451
/* }}} */
@@ -5515,6 +5521,7 @@ PHP_METHOD(DatePeriod, __unserialize)
55155521

55165522
if (!php_date_period_initialize_from_hash(period_obj, myht)) {
55175523
zend_throw_error(NULL, "Invalid serialization data for DatePeriod object");
5524+
RETURN_THROWS();
55185525
}
55195526
restore_custom_dateperiod_properties(object, myht);
55205527
}
@@ -5535,6 +5542,7 @@ PHP_METHOD(DatePeriod, __wakeup)
55355542

55365543
if (!php_date_period_initialize_from_hash(period_obj, myht)) {
55375544
zend_throw_error(NULL, "Invalid serialization data for DatePeriod object");
5545+
RETURN_THROWS();
55385546
}
55395547
}
55405548
/* }}} */

0 commit comments

Comments
 (0)