diff options
Diffstat (limited to 'ext')
| -rw-r--r-- | ext/reflection/php_reflection.c | 7 | ||||
| -rwxr-xr-x | ext/reflection/tests/008.phpt | 39 |
2 files changed, 46 insertions, 0 deletions
diff --git a/ext/reflection/php_reflection.c b/ext/reflection/php_reflection.c index 55189cda80..22b134bba8 100644 --- a/ext/reflection/php_reflection.c +++ b/ext/reflection/php_reflection.c @@ -2165,6 +2165,7 @@ ZEND_METHOD(reflection_method, __construct) return; } if ((tmp = strstr(name_str, "::")) == NULL) { + zend_throw_exception_ex(reflection_exception_ptr, 0 TSRMLS_CC, "Invalid method name %s", name_str); return; } classname = &ztmp; @@ -2186,6 +2187,9 @@ ZEND_METHOD(reflection_method, __construct) if (zend_lookup_class(Z_STRVAL_P(classname), Z_STRLEN_P(classname), &pce TSRMLS_CC) == FAILURE) { zend_throw_exception_ex(reflection_exception_ptr, 0 TSRMLS_CC, "Class %s does not exist", Z_STRVAL_P(classname)); + if (classname == &ztmp) { + zval_dtor(&ztmp); + } return; } ce = *pce; @@ -2196,6 +2200,9 @@ ZEND_METHOD(reflection_method, __construct) break; default: + if (classname == &ztmp) { + zval_dtor(&ztmp); + } _DO_THROW("The parameter class is expected to be either a string or an object"); /* returns out of this function */ } diff --git a/ext/reflection/tests/008.phpt b/ext/reflection/tests/008.phpt new file mode 100755 index 0000000000..2abdcdb57b --- /dev/null +++ b/ext/reflection/tests/008.phpt @@ -0,0 +1,39 @@ +--TEST-- +ReflectionMethod::__construct() tests +--FILE-- +<?php + +$a = array("", 1, "::", "a::", "::b", "a::b"); + +foreach ($a as $val) { + try { + new ReflectionMethod($val); + } catch (Exception $e) { + var_dump($e->getMessage()); + } +} + +$a = array("", 1, ""); +$b = array("", "", 1); + +foreach ($a as $key=>$val) { + try { + new ReflectionMethod($val, $b[$key]); + } catch (Exception $e) { + var_dump($e->getMessage()); + } +} + +echo "Done\n"; +?> +--EXPECTF-- +string(20) "Invalid method name " +string(21) "Invalid method name 1" +string(21) "Class does not exist" +string(22) "Class a does not exist" +string(21) "Class does not exist" +string(22) "Class a does not exist" +string(21) "Class does not exist" +string(66) "The parameter class is expected to be either a string or an object" +string(21) "Class does not exist" +Done |