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/reflection/php_reflection.c | |
| parent | 90a2e4ba668e89e59301abfe71175b0c0d1f9b96 (diff) | |
| download | php-git-457392fa64692be0927ed641369370f02afb0420.tar.gz | |
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 ab51925180..ecdec41e03 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; } |