diff options
| author | Nikita Popov <nikita.ppv@gmail.com> | 2019-02-26 15:32:18 +0100 |
|---|---|---|
| committer | Nikita Popov <nikita.ppv@gmail.com> | 2019-06-05 14:25:07 +0200 |
| commit | a31f46421d7bf6f55dd9ac5876b8e2eacf7e0708 (patch) | |
| tree | 24ffd7c5ae5e321c3994048fdd0fd9f68ae7457c /ext/date/php_date.c | |
| parent | 528aa7932a839fc6319979c34aa372805d8dc41c (diff) | |
| download | php-git-a31f46421d7bf6f55dd9ac5876b8e2eacf7e0708.tar.gz | |
Allow exceptions in __toString()
RFC: https://wiki.php.net/rfc/tostring_exceptions
And convert some object to string conversion related recoverable
fatal errors into Error exceptions.
Improve exception safety of internal code performing string
conversions.
Diffstat (limited to 'ext/date/php_date.c')
| -rw-r--r-- | ext/date/php_date.c | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/ext/date/php_date.c b/ext/date/php_date.c index f7db8a26d7..3e8fb419d8 100644 --- a/ext/date/php_date.c +++ b/ext/date/php_date.c @@ -2043,6 +2043,9 @@ static int date_interval_has_property(zval *object, zval *member, int type, void ZVAL_STR(&tmp_member, zval_get_string_func(member)); member = &tmp_member; cache_slot = NULL; + if (EG(exception)) { + return 0; + } } obj = Z_PHPINTERVAL_P(object); @@ -4167,6 +4170,9 @@ static zval *date_interval_read_property(zval *object, zval *member, int type, v ZVAL_STR(&tmp_member, zval_get_string_func(member)); member = &tmp_member; cache_slot = NULL; + if (EG(exception)) { + return &EG(uninitialized_zval); + } } obj = Z_PHPINTERVAL_P(object); @@ -4235,6 +4241,9 @@ static zval *date_interval_write_property(zval *object, zval *member, zval *valu ZVAL_STR(&tmp_member, zval_get_string_func(member)); member = &tmp_member; cache_slot = NULL; + if (EG(exception)) { + return value; + } } obj = Z_PHPINTERVAL_P(object); @@ -4286,6 +4295,9 @@ static zval *date_interval_get_property_ptr_ptr(zval *object, zval *member, int ZVAL_STR(&tmp_member, zval_get_string_func(member)); member = &tmp_member; cache_slot = NULL; + if (EG(exception)) { + return NULL; + } } if(zend_binary_strcmp("y", sizeof("y") - 1, Z_STRVAL_P(member), Z_STRLEN_P(member)) == 0 || |