diff options
| author | Bob Weinand <bobwei9@hotmail.com> | 2016-11-13 18:31:20 +0100 |
|---|---|---|
| committer | Bob Weinand <bobwei9@hotmail.com> | 2016-11-13 18:31:20 +0100 |
| commit | 882bcb724067a01daeae2adc5d6359807780f0ef (patch) | |
| tree | 980ce7645ecd9b67a27b31e7ad2184b532ec3d7c /sapi/phpdbg/phpdbg_bp.c | |
| parent | 1ccada35c08d35d87706c8c58cc72eebc80b718b (diff) | |
| parent | 6834b7344ddd2c63fe30bddec2a93b3064cdd599 (diff) | |
| download | php-git-882bcb724067a01daeae2adc5d6359807780f0ef.tar.gz | |
Merge branch 'PHP-7.1'
Diffstat (limited to 'sapi/phpdbg/phpdbg_bp.c')
| -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 d4a2d70c86..c7e36d6da9 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; |