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

phpdbg: fix potential format string bug

Browse source
This commit is contained in:
Insu Yun 2016-01-12 04:21:57 +00:00
parent 786d9599f6
commit 35d5cd5c6e
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_prompt.c
View file

@ -651,7 +651,7 @@ static inline void phpdbg_handle_exception(void) /* {{{ */
phpdbg_error("exception", "name=\"%s\" file=\"%s\" line=\"" ZEND_LONG_FMT "\"", "Uncaught %s in %s on line " ZEND_LONG_FMT, ZSTR_VAL(ex->ce->name), ZSTR_VAL(file), line); phpdbg_error("exception", "name=\"%s\" file=\"%s\" line=\"" ZEND_LONG_FMT "\"", "Uncaught %s in %s on line " ZEND_LONG_FMT, ZSTR_VAL(ex->ce->name), ZSTR_VAL(file), line);
zend_string_release(file); zend_string_release(file);
phpdbg_writeln("exceptionmsg", "msg=\"%s\"", ZSTR_VAL(msg)); phpdbg_writeln("exceptionmsg", "msg=\"%s\"", "%s", ZSTR_VAL(msg));
zend_string_release(msg); zend_string_release(msg);
if (EG(prev_exception)) { if (EG(prev_exception)) {
@ -1627,7 +1627,7 @@ next:
execute_data->call->func->type == ZEND_USER_FUNCTION) { execute_data->call->func->type == ZEND_USER_FUNCTION) {
zend_execute_ex = execute_ex; zend_execute_ex = execute_ex;
} }
PHPDBG_G(vmret) = zend_vm_call_opcode_handler(execute_data); PHPDBG_G(vmret) = zend_vm_call_opcode_handler(execute_data);
zend_execute_ex = phpdbg_execute_ex; zend_execute_ex = phpdbg_execute_ex;
if (PHPDBG_G(vmret) != 0) { if (PHPDBG_G(vmret) != 0) {