diff options
| -rw-r--r-- | NEWS | 4 | ||||
| -rw-r--r-- | sapi/phpdbg/phpdbg.c | 2 |
2 files changed, 5 insertions, 1 deletions
@@ -33,6 +33,10 @@ PHP NEWS . Fixed bug #62172 (FPM not working with Apache httpd 2.4 balancer/fcgi setup). (Matt Haught, Remi) +- phpdbg: + . Fixed inherited functions from unspecified files being included in + phpdbg_get_executable(). (Bob) + - Standard: . Fixed bug #70720 (strip_tags improper php code parsing). (Julien) diff --git a/sapi/phpdbg/phpdbg.c b/sapi/phpdbg/phpdbg.c index 8acf061983..bf68e301fd 100644 --- a/sapi/phpdbg/phpdbg.c +++ b/sapi/phpdbg/phpdbg.c @@ -554,7 +554,7 @@ static PHP_FUNCTION(phpdbg_get_executable) if (ce->type == ZEND_USER_CLASS) { if (zend_hash_exists(files, ce->info.user.filename)) { ZEND_HASH_FOREACH_PTR(&ce->function_table, func) { - if (func->type == ZEND_USER_FUNCTION) { + if (func->type == ZEND_USER_FUNCTION && zend_hash_exists(files, func->op_array.filename)) { insert_ht = phpdbg_add_empty_array(Z_ARR_P(return_value), func->op_array.filename); if (by_function) { |