diff options
| author | Nikita Popov <nikita.ppv@gmail.com> | 2019-06-05 14:38:01 +0200 |
|---|---|---|
| committer | Nikita Popov <nikita.ppv@gmail.com> | 2019-06-05 14:53:50 +0200 |
| commit | 7686b0b88906e2522300b9e631ddde2051de839f (patch) | |
| tree | 31a3cfd1feaf6f7190bad8222a6f9da567acd723 /ext/xml/xml.c | |
| parent | 03a9c2df7baea96a4777346c8799f0a6fdd7c882 (diff) | |
| parent | a31f46421d7bf6f55dd9ac5876b8e2eacf7e0708 (diff) | |
| download | php-git-7686b0b88906e2522300b9e631ddde2051de839f.tar.gz | |
Merge branch 'PHP-7.4'
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 23cbcb5772..c25b0b2ae3 100644 --- a/ext/xml/xml.c +++ b/ext/xml/xml.c @@ -1617,7 +1617,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)); |