Skip to content

Fix crashes when trying to instantiate uninstantiable classes via date static constructors #20361

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

Open
wants to merge 1 commit into
base: PHP-8.3
Choose a base branch
from
+82 −7
Open

Fix crashes when trying to instantiate uninstantiable classes via date static constructors #20361

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
28 changes: 21 additions & 7 deletions ext/date/php_date.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1476,7 +1476,8 @@ static void create_date_period_datetime(timelib_time *datetime, zend_class_entry
if (datetime) {
php_date_obj *date_obj;

object_init_ex(zv, ce);
zend_result result = object_init_ex(zv, ce);
ZEND_ASSERT(result == SUCCESS && "should succeed as it reuses an existing object's ce");
date_obj = Z_PHPDATE_P(zv);
date_obj->time = timelib_time_clone(datetime);
} else {
Expand Down Expand Up @@ -2345,6 +2346,7 @@ static void add_common_properties(HashTable *myht, zend_object *zobj)
}

/* Advanced Interface */
/* TODO: remove this API because it is unsafe to use as-is, as it does not propagate the failure/success status. */
PHPAPI zval *php_date_instantiate(zend_class_entry *pce, zval *object) /* {{{ */
{
object_init_ex(object, pce);
Expand Down Expand Up @@ -2564,7 +2566,9 @@ PHP_FUNCTION(date_create_from_format)
Z_PARAM_OBJECT_OF_CLASS_OR_NULL(timezone_object, date_ce_timezone)
ZEND_PARSE_PARAMETERS_END();

php_date_instantiate(execute_data->This.value.ce ? execute_data->This.value.ce : date_ce_date, return_value);
if (object_init_ex(return_value, execute_data->This.value.ce ? execute_data->This.value.ce : date_ce_date) != SUCCESS) {
RETURN_THROWS();
}
if (!php_date_initialize(Z_PHPDATE_P(return_value), time_str, time_str_len, format_str, timezone_object, PHP_DATE_INIT_FORMAT)) {
zval_ptr_dtor(return_value);
RETURN_FALSE;
Expand Down Expand Up @@ -2642,7 +2646,9 @@ PHP_METHOD(DateTime, createFromImmutable)
old_obj = Z_PHPDATE_P(datetimeimmutable_object);
DATE_CHECK_INITIALIZED(old_obj->time, Z_OBJCE_P(datetimeimmutable_object));

php_date_instantiate(execute_data->This.value.ce ? execute_data->This.value.ce : date_ce_date, return_value);
if (object_init_ex(return_value, execute_data->This.value.ce ? execute_data->This.value.ce : date_ce_date) != SUCCESS) {
RETURN_THROWS();
}
new_obj = Z_PHPDATE_P(return_value);

new_obj->time = timelib_time_clone(old_obj->time);
Expand All @@ -2663,7 +2669,9 @@ PHP_METHOD(DateTime, createFromInterface)
old_obj = Z_PHPDATE_P(datetimeinterface_object);
DATE_CHECK_INITIALIZED(old_obj->time, Z_OBJCE_P(datetimeinterface_object));

php_date_instantiate(execute_data->This.value.ce ? execute_data->This.value.ce : date_ce_date, return_value);
if (object_init_ex(return_value, execute_data->This.value.ce ? execute_data->This.value.ce : date_ce_date) != SUCCESS) {
RETURN_THROWS();
}
new_obj = Z_PHPDATE_P(return_value);

new_obj->time = timelib_time_clone(old_obj->time);
Expand All @@ -2684,7 +2692,9 @@ PHP_METHOD(DateTimeImmutable, createFromMutable)
old_obj = Z_PHPDATE_P(datetime_object);
DATE_CHECK_INITIALIZED(old_obj->time, Z_OBJCE_P(datetime_object));

php_date_instantiate(execute_data->This.value.ce ? execute_data->This.value.ce : date_ce_immutable, return_value);
if (object_init_ex(return_value, execute_data->This.value.ce ? execute_data->This.value.ce : date_ce_immutable) != SUCCESS) {
RETURN_THROWS();
}
new_obj = Z_PHPDATE_P(return_value);

new_obj->time = timelib_time_clone(old_obj->time);
Expand All @@ -2705,7 +2715,9 @@ PHP_METHOD(DateTimeImmutable, createFromInterface)
old_obj = Z_PHPDATE_P(datetimeinterface_object);
DATE_CHECK_INITIALIZED(old_obj->time, Z_OBJCE_P(datetimeinterface_object));

php_date_instantiate(execute_data->This.value.ce ? execute_data->This.value.ce : date_ce_immutable, return_value);
if (object_init_ex(return_value, execute_data->This.value.ce ? execute_data->This.value.ce : date_ce_immutable) != SUCCESS) {
RETURN_THROWS();
}
new_obj = Z_PHPDATE_P(return_value);

new_obj->time = timelib_time_clone(old_obj->time);
Expand Down Expand Up @@ -4950,7 +4962,9 @@ PHP_METHOD(DatePeriod, createFromISO8601String)
RETURN_THROWS();
}

object_init_ex(return_value, execute_data->This.value.ce ? execute_data->This.value.ce : date_ce_period);
if (object_init_ex(return_value, execute_data->This.value.ce ? execute_data->This.value.ce : date_ce_period) != SUCCESS) {
RETURN_THROWS();
}
dpobj = Z_PHPPERIOD_P(return_value);

dpobj->current = NULL;
Expand Down
61 changes: 61 additions & 0 deletions ext/date/tests/instantiate_uninstantiable_classes.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,61 @@
--TEST--
Instantiating uninstantiable classes via static constructors
--FILE--
<?php

abstract class MyDatePeriod extends DatePeriod {
public abstract function foo();
}

abstract class MyDateTime extends DateTime {
public abstract function foo();
}

abstract class MyDateTimeImmutable extends DateTimeImmutable {
public abstract function foo();
}

try {
MyDatePeriod::createFromISO8601String('R5');
} catch (Error $e) {
echo $e->getMessage(), "\n";
}

try {
MyDateTime::createFromFormat('Y-m-d', '2025-01-01');
} catch (Error $e) {
echo $e->getMessage(), "\n";
}

try {
MyDateTime::createFromImmutable(new DateTimeImmutable());
} catch (Error $e) {
echo $e->getMessage(), "\n";
}

try {
MyDateTime::createFromInterface(new DateTimeImmutable());
} catch (Error $e) {
echo $e->getMessage(), "\n";
}

try {
MyDateTimeImmutable::createFromMutable(new DateTime());
} catch (Error $e) {
echo $e->getMessage(), "\n";
}

try {
MyDateTimeImmutable::createFromInterface(new DateTime());
} catch (Error $e) {
echo $e->getMessage(), "\n";
}

?>
--EXPECT--
Cannot instantiate abstract class MyDatePeriod
Cannot instantiate abstract class MyDateTime
Cannot instantiate abstract class MyDateTime
Cannot instantiate abstract class MyDateTime
Cannot instantiate abstract class MyDateTimeImmutable
Cannot instantiate abstract class MyDateTimeImmutable
Loading