diff options
| author | Dmitry Stogov <dmitry@zend.com> | 2019-06-06 02:23:17 +0300 |
|---|---|---|
| committer | Dmitry Stogov <dmitry@zend.com> | 2019-06-06 02:23:17 +0300 |
| commit | e029cc4dd45c4ee5ab6678d6c732df9ed17b06d0 (patch) | |
| tree | 20c4ac0d20f4f996c9436b40316048de1c106a44 /ext/reflection/php_reflection.c | |
| parent | b4d21310cb965e50b00d02dcb4d5b2afb0521424 (diff) | |
| parent | 457392fa64692be0927ed641369370f02afb0420 (diff) | |
| download | php-git-e029cc4dd45c4ee5ab6678d6c732df9ed17b06d0.tar.gz | |
Merge branch 'PHP-7.4'
* PHP-7.4:
Cheaper checks for exceptions thrown from __toString()
Diffstat (limited to 'ext/reflection/php_reflection.c')
| -rw-r--r-- | ext/reflection/php_reflection.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/ext/reflection/php_reflection.c b/ext/reflection/php_reflection.c index 30f0152f90..eebea38bc8 100644 --- a/ext/reflection/php_reflection.c +++ b/ext/reflection/php_reflection.c @@ -2275,8 +2275,8 @@ ZEND_METHOD(reflection_parameter, __construct) if (Z_TYPE_P(classref) == IS_OBJECT) { ce = Z_OBJCE_P(classref); } else { - name = zval_get_string(classref); - if (EG(exception)) { + name = zval_try_get_string(classref); + if (UNEXPECTED(!name)) { return; } if ((ce = zend_lookup_class(name)) == NULL) { @@ -2288,8 +2288,8 @@ ZEND_METHOD(reflection_parameter, __construct) zend_string_release(name); } - name = zval_get_string(method); - if (EG(exception)) { + name = zval_try_get_string(method); + if (UNEXPECTED(!name)) { return; } |