diff options
| author | Nikita Popov <nikic@php.net> | 2016-02-14 14:47:42 +0100 |
|---|---|---|
| committer | Nikita Popov <nikic@php.net> | 2016-02-14 14:47:42 +0100 |
| commit | 2d605e5f2448e0bc7141ca5d5cb27cb4d9f99aa9 (patch) | |
| tree | d8919bc530f566039496bb3638209ff3390eaeb4 /sapi/phpdbg/phpdbg_prompt.c | |
| parent | be607e724c69c92f8cda72a45a13a26e7c439aec (diff) | |
| parent | c9357f82d3882eb3c7cb9f63dbc98d354fb20739 (diff) | |
| download | php-git-2d605e5f2448e0bc7141ca5d5cb27cb4d9f99aa9.tar.gz | |
Merge branch 'PHP-7.0'
Diffstat (limited to 'sapi/phpdbg/phpdbg_prompt.c')
| -rw-r--r-- | sapi/phpdbg/phpdbg_prompt.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/sapi/phpdbg/phpdbg_prompt.c b/sapi/phpdbg/phpdbg_prompt.c index 796519ffdf..63f1f01ede 100644 --- a/sapi/phpdbg/phpdbg_prompt.c +++ b/sapi/phpdbg/phpdbg_prompt.c @@ -1518,7 +1518,11 @@ void phpdbg_execute_ex(zend_execute_data *execute_data) /* {{{ */ line = zval_get_long(zend_read_property(zend_get_exception_base(&zv), &zv, ZEND_STRL("line"), 1, &rv)); msg = zval_get_string(zend_read_property(zend_get_exception_base(&zv), &zv, ZEND_STRL("message"), 1, &rv)); - phpdbg_error("exception", "name=\"%s\" file=\"%s\" line=\"" ZEND_LONG_FMT "\"", "Uncaught %s in %s on line " ZEND_LONG_FMT ": %.*s", ZSTR_VAL(exception->ce->name), ZSTR_VAL(file), line, ZSTR_LEN(msg) < 80 ? ZSTR_LEN(msg) : 80, ZSTR_VAL(msg)); + phpdbg_error("exception", + "name=\"%s\" file=\"%s\" line=\"" ZEND_LONG_FMT "\"", + "Uncaught %s in %s on line " ZEND_LONG_FMT ": %.*s", + ZSTR_VAL(exception->ce->name), ZSTR_VAL(file), line, + ZSTR_LEN(msg) < 80 ? (int) ZSTR_LEN(msg) : 80, ZSTR_VAL(msg)); zend_string_release(msg); zend_string_release(file); |