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/standard/array.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/standard/array.c')
| -rw-r--r-- | ext/standard/array.c | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/ext/standard/array.c b/ext/standard/array.c index 5448a1815d..71a7cf17e7 100644 --- a/ext/standard/array.c +++ b/ext/standard/array.c @@ -2458,7 +2458,10 @@ PHP_FUNCTION(extract) } if (prefix) { - convert_to_string(prefix); + if (!try_convert_to_string(prefix)) { + return; + } + if (Z_STRLEN_P(prefix) && !php_valid_var_name(Z_STRVAL_P(prefix), Z_STRLEN_P(prefix))) { php_error_docref(NULL, E_WARNING, "prefix is not a valid identifier"); return; @@ -4134,7 +4137,9 @@ zend_bool array_column_param_helper(zval *param, return 1; case IS_OBJECT: - convert_to_string_ex(param); + if (!try_convert_to_string(param)) { + return 0; + } /* fallthrough */ case IS_STRING: return 1; |