diff options
| author | Anatol Belski <ab@php.net> | 2015-09-02 22:08:24 +0200 |
|---|---|---|
| committer | Anatol Belski <ab@php.net> | 2015-09-02 22:08:24 +0200 |
| commit | 6ef7c6358fc37579d329268cbb56ab730bed2159 (patch) | |
| tree | 2fe3452647d7450c867de9eab62f456ed77a2553 /sapi/phpdbg/phpdbg_info.c | |
| parent | b7e910e9696001ae6fa728c10362f657b4b97742 (diff) | |
| parent | fcece2a7bb0ecf1af1034a737bf5686a354e01d7 (diff) | |
| download | php-git-6ef7c6358fc37579d329268cbb56ab730bed2159.tar.gz | |
Merge branch 'master' into PHP-7.0.0
* master: (201 commits)
sync NEWS
Add missing variable from birdstep_commit() which got removed in e8fcd52ef
Align NEWS entries format
Add CVE for #70140 (PHP 7.0.0 Beta 3)
Seems master is not affected
We should keep one refcount to resource
Fixed bug #70398 (SIGSEGV, Segmentation fault zend_ast_destroy_ex)
Fixed test
Partially fix bug #67167 - Wrong return value...
move the phpdbg NEWS entry to the correct version
add missing news entries
Skip if ext/filter isn't loaded
Merge branch 'PHP-5.6'
5.5.30 next
Use ZSTR_VAL
fix dir separators in test
use correct api
fix leak
cleanup an atavism
add overflow check
...
Diffstat (limited to 'sapi/phpdbg/phpdbg_info.c')
| -rw-r--r-- | sapi/phpdbg/phpdbg_info.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sapi/phpdbg/phpdbg_info.c b/sapi/phpdbg/phpdbg_info.c index 51e12b7e82..f947dc4864 100644 --- a/sapi/phpdbg/phpdbg_info.c +++ b/sapi/phpdbg/phpdbg_info.c @@ -72,7 +72,7 @@ PHPDBG_INFO(files) /* {{{ */ phpdbg_try_access { ZEND_HASH_FOREACH_STR_KEY(&EG(included_files), fname) { - phpdbg_writeln("includedfile", "name=\"%s\"", "File: %s", fname); + phpdbg_writeln("includedfile", "name=\"%s\"", "File: %s", ZSTR_VAL(fname)); } ZEND_HASH_FOREACH_END(); } phpdbg_catch_access { phpdbg_error("signalsegv", "", "Could not fetch file name, invalid data source, aborting included file listing"); @@ -274,7 +274,7 @@ retry_switch: #undef VARIABLEINFO } phpdbg_catch_access { - phpdbg_writeln("variable", "address=\"%p\" name=\"%s\"", "%p\tn/a\tn/a\t$%s", data, var); + phpdbg_writeln("variable", "address=\"%p\" name=\"%s\"", "%p\tn/a\tn/a\t$%s", data, ZSTR_VAL(var)); } phpdbg_end_try_access(); } ZEND_HASH_FOREACH_END(); } |