diff options
| author | Bob Weinand <bobwei9@hotmail.com> | 2016-11-13 13:22:50 +0100 |
|---|---|---|
| committer | Bob Weinand <bobwei9@hotmail.com> | 2016-11-13 13:22:50 +0100 |
| commit | 5a4bad7b5f83ff86b0d75ed6557b8e29b76fc645 (patch) | |
| tree | 3217b6f97782935f9568e130364547a85df1047e /sapi/phpdbg/phpdbg_bp.c | |
| parent | 1e65d0ea67a479da18578a498fd8805fac1ea2d8 (diff) | |
| parent | ef657978b24d889ab335c2c238352f5152188705 (diff) | |
| download | php-git-5a4bad7b5f83ff86b0d75ed6557b8e29b76fc645.tar.gz | |
Merge branch 'PHP-7.1'
Diffstat (limited to 'sapi/phpdbg/phpdbg_bp.c')
| -rw-r--r-- | sapi/phpdbg/phpdbg_bp.c | 21 |
1 files changed, 14 insertions, 7 deletions
diff --git a/sapi/phpdbg/phpdbg_bp.c b/sapi/phpdbg/phpdbg_bp.c index da4c8f71bf..d4a2d70c86 100644 --- a/sapi/phpdbg/phpdbg_bp.c +++ b/sapi/phpdbg/phpdbg_bp.c @@ -25,6 +25,7 @@ #include "phpdbg_utils.h" #include "phpdbg_opcode.h" #include "zend_globals.h" +#include "ext/standard/php_string.h" ZEND_EXTERN_MODULE_GLOBALS(phpdbg) @@ -135,10 +136,12 @@ PHPDBG_API void phpdbg_export_breakpoints_to_string(char **str) /* {{{ */ switch (brake->type) { case PHPDBG_BREAK_FILE: { + zend_string *filename = php_addcslashes(zend_string_init(((phpdbg_breakfile_t*)brake)->filename, strlen(((phpdbg_breakfile_t*)brake)->filename), 0), 1, "\\\"\n", 3); phpdbg_asprintf(&new_str, - "%sbreak %s:%lu\n", *str, - ((phpdbg_breakfile_t*)brake)->filename, + "%sbreak \"%s\":%lu\n", *str, + ZSTR_VAL(filename), ((phpdbg_breakfile_t*)brake)->line); + zend_string_release(filename); } break; case PHPDBG_BREAK_SYM: { @@ -170,10 +173,12 @@ PHPDBG_API void phpdbg_export_breakpoints_to_string(char **str) /* {{{ */ } break; case PHPDBG_BREAK_FILE_OPLINE: { + 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, - ((phpdbg_breakopline_t*)brake)->class_name, + "%sbreak \"%s\":#%llu\n", *str, + filename, ((phpdbg_breakopline_t*)brake)->opline_num); + zend_string_release(filename); } break; case PHPDBG_BREAK_OPCODE: { @@ -199,12 +204,14 @@ PHPDBG_API void phpdbg_export_breakpoints_to_string(char **str) /* {{{ */ conditional->code); break; - case FILE_PARAM: + case FILE_PARAM: { + 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, + "%sbreak at \"%s\":%lu if %s\n", *str, conditional->param.file.name, conditional->param.file.line, conditional->code); - break; + zend_string_release(filename); + } break; default: { /* do nothing */ } break; } |