mirrors/php-src
0
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-11-24 18:34:21 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix phpdbg class fetch / method opcodes

Browse Source
This commit is contained in:
Bob Weinand 2015-05-27 00:55:15 +02:00
parent 7dac4d449f
commit 5bec1490f9
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
sapi/phpdbg/phpdbg_print.c
View File

@ -282,12 +282,13 @@ void phpdbg_print_opcodes_function(const char *function, size_t len) {
}
void phpdbg_print_opcodes_method(const char *class, const char *function) {
zend_class_entry *ce = zend_hash_str_find_ptr(EG(class_table), class, strlen(class));
zend_class_entry *ce;
zend_function *func;
if (!ce) {
if (phpdbg_safe_class_lookup(class, strlen(class), &ce) != SUCCESS) {
return;
}
if (ce->type != ZEND_USER_CLASS) {
phpdbg_out("function name: %s::%s (internal)\n", class, function);
return;
@ -348,7 +349,6 @@ void phpdbg_print_opcodes_class(const char *class) {
PHPDBG_API void phpdbg_print_opcodes(char *function)
{
char *method_name;
strtok(function, ":");
if (function == NULL) {
@ -376,7 +376,7 @@ PHPDBG_API void phpdbg_print_opcodes(char *function)
} ZEND_HASH_FOREACH_END();
} else if ((method_name = strtok(NULL, ":")) == NULL) {
phpdbg_print_opcodes_function(function, strlen(function));
} else if (++method_name == NULL || ++method_name == NULL) {
} else if ((method_name + 1) == NULL) {
phpdbg_print_opcodes_class(function);
} else {
phpdbg_print_opcodes_method(function, method_name);

2
sapi/phpdbg/phpdbg_utils.c
View File

@ -384,7 +384,7 @@ int phpdbg_safe_class_lookup(const char *name, int name_length, zend_class_entry
efree(str_name);
}
return ce ? SUCCESS : FAILURE;
return *ce ? SUCCESS : FAILURE;
}
char *phpdbg_get_property_key(char *key) {