diff options
| author | Dmitry Stogov <dmitry@zend.com> | 2019-06-06 01:47:22 +0300 |
|---|---|---|
| committer | Dmitry Stogov <dmitry@zend.com> | 2019-06-06 01:47:22 +0300 |
| commit | 457392fa64692be0927ed641369370f02afb0420 (patch) | |
| tree | e83d85fadb66cffa22fc119d3df60e72f2f9a007 /ext/mbstring/mbstring.c | |
| parent | 90a2e4ba668e89e59301abfe71175b0c0d1f9b96 (diff) | |
| download | php-git-457392fa64692be0927ed641369370f02afb0420.tar.gz | |
Cheaper checks for exceptions thrown from __toString()
Diffstat (limited to 'ext/mbstring/mbstring.c')
| -rw-r--r-- | ext/mbstring/mbstring.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/ext/mbstring/mbstring.c b/ext/mbstring/mbstring.c index e3611562e5..bf71270452 100644 --- a/ext/mbstring/mbstring.c +++ b/ext/mbstring/mbstring.c @@ -826,8 +826,8 @@ php_mb_parse_encoding_array(zval *array, const mbfl_encoding ***return_list, siz bauto = 0; n = 0; ZEND_HASH_FOREACH_VAL(target_hash, hash_entry) { - zend_string *encoding_str = zval_get_string(hash_entry); - if (EG(exception)) { + zend_string *encoding_str = zval_try_get_string(hash_entry); + if (UNEXPECTED(!encoding_str)) { ret = FAILURE; break; } @@ -3348,8 +3348,8 @@ PHP_FUNCTION(mb_convert_encoding) _from_encodings = NULL; ZEND_HASH_FOREACH_VAL(target_hash, hash_entry) { - zend_string *encoding_str = zval_get_string(hash_entry); - if (EG(exception)) { + zend_string *encoding_str = zval_try_get_string(hash_entry); + if (UNEXPECTED(!encoding_str)) { if (_from_encodings) { efree(_from_encodings); } |