com php-src: phpdbg: fix potential format string bug: sapi/phpdbg/phpdbg_prompt.c
| From: | Xinchen Hui | Date: | Tue, 12 Jan 2016 04:21:57 +0000 |
| Subject: | com php-src: phpdbg: fix potential format string bug: sapi/phpdbg/phpdbg_prompt.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-90637@lists.php.net to get a copy of this message | ||
Commit: 35d5cd5c6e2d160952274b67d4c20e59f351dd0b
Author: Insu Yun <wuninsu@gmail.com> Tue, 12 Jan 2016 04:21:57 +0000
Parents: 786d9599f697abc2fae0d6458f571ce8b2d1adc2
Branches: master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=35d5cd5c6e2d160952274b67d4c20e59f351dd0b
Log:
phpdbg: fix potential format string bug
Changed paths:
M sapi/phpdbg/phpdbg_prompt.c
Diff:
diff --git a/sapi/phpdbg/phpdbg_prompt.c b/sapi/phpdbg/phpdbg_prompt.c
index 9724976..796519f 100644
--- a/sapi/phpdbg/phpdbg_prompt.c
+++ b/sapi/phpdbg/phpdbg_prompt.c
@@ -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);
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);
if (EG(prev_exception)) {
@@ -1627,7 +1627,7 @@ next:
execute_data->call->func->type == ZEND_USER_FUNCTION) {
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;
if (PHPDBG_G(vmret) != 0) {