From 457392fa64692be0927ed641369370f02afb0420 Mon Sep 17 00:00:00 2001 From: Dmitry Stogov Date: Thu, 6 Jun 2019 01:47:22 +0300 Subject: Cheaper checks for exceptions thrown from __toString() --- ext/reflection/php_reflection.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'ext/reflection/php_reflection.c') 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; } -- cgit v1.2.1