archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-15 21:48:51 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Merge branch 'PHP-7.1'

Browse source
This commit is contained in:
Bob Weinand 2016-11-13 18:31:20 +01:00
commit 882bcb7240
1 changed files with 2 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

4
sapi/phpdbg/phpdbg_bp.c
View file

@ -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); 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, phpdbg_asprintf(&new_str,
"%sbreak \"%s\":#%llu\n", *str, "%sbreak \"%s\":#%llu\n", *str,
filename, ZSTR_VAL(filename),
((phpdbg_breakopline_t*)brake)->opline_num); ((phpdbg_breakopline_t*)brake)->opline_num);
zend_string_release(filename); zend_string_release(filename);
} break; } 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); 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, 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, ZSTR_VAL(filename), conditional->param.file.line,
conditional->code); conditional->code);
zend_string_release(filename); zend_string_release(filename);
} break; } break;