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/simplexml/simplexml.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/simplexml/simplexml.c')
| -rw-r--r-- | ext/simplexml/simplexml.c | 19 |
1 files changed, 17 insertions, 2 deletions
diff --git a/ext/simplexml/simplexml.c b/ext/simplexml/simplexml.c index fb55b6b195..01c119888e 100644 --- a/ext/simplexml/simplexml.c +++ b/ext/simplexml/simplexml.c @@ -260,6 +260,9 @@ long_dim: if (Z_TYPE_P(member) != IS_STRING) { ZVAL_STR(&tmp_zv, zval_get_string_func(member)); member = &tmp_zv; + if (EG(exception)) { + return &EG(uninitialized_zval); + } } name = Z_STRVAL_P(member); } @@ -455,6 +458,10 @@ long_dim: } else { if (Z_TYPE_P(member) != IS_STRING) { trim_str = zval_get_string_func(member); + if (EG(exception)) { + return &EG(error_zval); + } + ZVAL_STR(&tmp_zv, php_trim(trim_str, NULL, 0, 3)); zend_string_release_ex(trim_str, 0); member = &tmp_zv; @@ -672,10 +679,12 @@ static zval *sxe_property_get_adr(zval *object, zval *member, int fetch_type, vo char *name; SXE_ITER type; - sxe = Z_SXEOBJ_P(object); + if (!try_convert_to_string(member)) { + return NULL; + } + sxe = Z_SXEOBJ_P(object); GET_NODE(sxe, node); - convert_to_string(member); name = Z_STRVAL_P(member); node = sxe_get_element_by_name(sxe, node, &name, &type); if (node) { @@ -713,6 +722,9 @@ static int sxe_prop_dim_exists(zval *object, zval *member, int check_empty, zend if (Z_TYPE_P(member) != IS_STRING && Z_TYPE_P(member) != IS_LONG) { ZVAL_STR(&tmp_zv, zval_get_string_func(member)); member = &tmp_zv; + if (EG(exception)) { + return 0; + } } sxe = Z_SXEOBJ_P(object); @@ -832,6 +844,9 @@ static void sxe_prop_dim_delete(zval *object, zval *member, zend_bool elements, if (Z_TYPE_P(member) != IS_STRING && Z_TYPE_P(member) != IS_LONG) { ZVAL_STR(&tmp_zv, zval_get_string_func(member)); member = &tmp_zv; + if (EG(exception)) { + return; + } } sxe = Z_SXEOBJ_P(object); |