]> granicus.if.org Git - php/commitdiff
phpdbg: fix potential format string bug
authorInsu Yun <wuninsu@gmail.com>
Tue, 12 Jan 2016 04:21:57 +0000 (04:21 +0000)
committerInsu Yun <wuninsu@gmail.com>
Tue, 12 Jan 2016 04:21:57 +0000 (04:21 +0000)
sapi/phpdbg/phpdbg_prompt.c

index 97249765f8a40bcc87bdb0475bdb6e620abf4f1d..796519ffdf1192cfc40f4b75406e7ab96d908829 100644 (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);
        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) {