com php-src: Fixed inherited functions from unspecified files being included in phpdbg_get_executable(): NEWS sapi/ph pdbg/phpdbg.c
| From: | Bob Weinand | Date: | Thu, 11 Feb 2016 05:42:51 +0000 |
| Subject: | com php-src: Fixed inherited functions from unspecified files being included in phpdbg_get_executable(): NEWS sapi/ph pdbg/phpdbg.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-90984@lists.php.net to get a copy of this message | ||
Commit: 1a01a5ec83394fa8375d70075eeaf496078e3e11
Author: Bob Weinand <bobwei9@hotmail.com> Thu, 11 Feb 2016 06:42:51 +0100
Parents: aa3f44a395f9197f112ced584539055fa836eac4
Branches: PHP-7.0
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=1a01a5ec83394fa8375d70075eeaf496078e3e11
Log:
Fixed inherited functions from unspecified files being included in phpdbg_get_executable()
See also https://github.com/krakjoe/phpdbg/issues/152
Changed paths:
M NEWS
M sapi/phpdbg/phpdbg.c
Diff:
diff --git a/NEWS b/NEWS
index d15eb75..4e00285 100644
--- a/NEWS
+++ b/NEWS
@@ -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 8acf061..bf68e30 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) {