diff options
| author | Bob Weinand <bobwei9@hotmail.com> | 2016-11-13 18:30:49 +0100 |
|---|---|---|
| committer | Bob Weinand <bobwei9@hotmail.com> | 2016-11-13 18:30:49 +0100 |
| commit | 6834b7344ddd2c63fe30bddec2a93b3064cdd599 (patch) | |
| tree | 28062e03742f59cc8e6617c02b026c4875d8dca8 | |
| parent | ef657978b24d889ab335c2c238352f5152188705 (diff) | |
| parent | 22a43551a2fc25fc63bf53390c6ba0a1b8c742bf (diff) | |
| download | php-git-6834b7344ddd2c63fe30bddec2a93b3064cdd599.tar.gz | |
Merge branch 'PHP-7.0' into PHP-7.1
| -rw-r--r-- | sapi/phpdbg/phpdbg_bp.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sapi/phpdbg/phpdbg_bp.c b/sapi/phpdbg/phpdbg_bp.c index 5b70fe8bbb..49f74b87a9 100644 --- a/sapi/phpdbg/phpdbg_bp.c +++ b/sapi/phpdbg/phpdbg_bp.c @@ -176,7 +176,7 @@ PHPDBG_API void phpdbg_export_breakpoints_to_string(char **str) /* {{{ */ zend_string *filename = php_addcslashes(zend_string_init(((phpdbg_breakopline_t*)brake)->class_name, strlen(((phpdbg_breakopline_t*)brake)->class_name), 0), 1, "\\\"\n", 3); phpdbg_asprintf(&new_str, "%sbreak \"%s\":#%llu\n", *str, - filename, + ZSTR_VAL(filename), ((phpdbg_breakopline_t*)brake)->opline_num); zend_string_release(filename); } break; @@ -208,7 +208,7 @@ PHPDBG_API void phpdbg_export_breakpoints_to_string(char **str) /* {{{ */ zend_string *filename = php_addcslashes(zend_string_init(conditional->param.file.name, strlen(conditional->param.file.name), 0), 1, "\\\"\n", 3); phpdbg_asprintf(&new_str, "%sbreak at \"%s\":%lu if %s\n", *str, - conditional->param.file.name, conditional->param.file.line, + ZSTR_VAL(filename), conditional->param.file.line, conditional->code); zend_string_release(filename); } break; |