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/xml/xml.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/xml/xml.c')
| -rw-r--r-- | ext/xml/xml.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/ext/xml/xml.c b/ext/xml/xml.c index f60f08bd57..fb60883226 100644 --- a/ext/xml/xml.c +++ b/ext/xml/xml.c @@ -1629,7 +1629,10 @@ PHP_FUNCTION(xml_parser_set_option) break; case PHP_XML_OPTION_TARGET_ENCODING: { const xml_encoding *enc; - convert_to_string_ex(val); + if (!try_convert_to_string(val)) { + return; + } + enc = xml_get_encoding((XML_Char*)Z_STRVAL_P(val)); if (enc == NULL) { php_error_docref(NULL, E_WARNING, "Unsupported target encoding \"%s\"", Z_STRVAL_P(val)); |