From c0a389a9277070f5ef53c230f34aa5072a9f0985 Mon Sep 17 00:00:00 2001 From: "Christoph M. Becker" Date: Wed, 5 Sep 2018 15:05:19 +0200 Subject: Fix #74454: Wrong exception being thrown when using ReflectionMethod If zend_throw_exception_ex() already threw an exception, we should not throw again. --- ext/reflection/php_reflection.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'ext/reflection/php_reflection.c') diff --git a/ext/reflection/php_reflection.c b/ext/reflection/php_reflection.c index 690aaa0fe6..bd2d824c38 100644 --- a/ext/reflection/php_reflection.c +++ b/ext/reflection/php_reflection.c @@ -3130,8 +3130,10 @@ ZEND_METHOD(reflection_method, __construct) switch (Z_TYPE_P(classname)) { case IS_STRING: if ((ce = zend_lookup_class(Z_STR_P(classname))) == NULL) { - zend_throw_exception_ex(reflection_exception_ptr, 0, - "Class %s does not exist", Z_STRVAL_P(classname)); + if (!EG(exception)) { + zend_throw_exception_ex(reflection_exception_ptr, 0, + "Class %s does not exist", Z_STRVAL_P(classname)); + } if (classname == &ztmp) { zval_dtor(&ztmp); } -- cgit v1.2.1