com php-src: Fixed info literal: phpdbg.c phpdbg_info.c

From: Date: Sat, 23 Nov 2013 17:36:33 +0000
Subject: com php-src: Fixed info literal: phpdbg.c phpdbg_info.c
Groups: php.cvs 
Request: Send a blank email to php-cvs+get-74683@lists.php.net to get a copy of this message
Commit: eb67cb6914c593b19cb085619cb3a9f2ff6185a6 Author: Bob Weinand <bobwei9@hotmail.com> Sat, 23 Nov 2013 18:36:33 +0100 Parents: b76b543cae6555f852ff5d08ca4ae17e8666589d Branches: PHP-5.6 Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=eb67cb6914c593b19cb085619cb3a9f2ff6185a6 Log: Fixed info literal Changed paths: M phpdbg.c M phpdbg_info.c Diff: diff --git a/phpdbg..c b/phpdbg.c index e5aee66..4995918 100644 --- a/phpdbg.c +++ b/phpdbg.c @@ -338,7 +338,7 @@ static void php_sapi_phpdbg_register_vars(zval *track_vars_array TSRMLS_DC) /* { static inline int php_sapi_phpdbg_ub_write(const char *message, unsigned int length TSRMLS_DC) /* {{{ */ { - return phpdbg_write(message); + return phpdbg_write("%s", message); } /* }}} */ static inline void php_sapi_phpdbg_flush(void *context) /* {{{ */ diff --git a/phpdbg_info.c b/phpdbg_info.c index ed63cad..f7588fe 100644 --- a/phpdbg_info.c +++ b/phpdbg_info.c @@ -172,11 +172,13 @@ PHPDBG_INFO(literal) /* {{{ */ } while (literal < ops->last_literal) { - phpdbg_write("|-------- C%lu -------> [", literal); - zend_print_zval( - &ops->literals[literal].constant, 0); - phpdbg_write("]"); - phpdbg_writeln(EMPTY); + if (Z_TYPE(ops->literals[literal].constant) != IS_NULL) { + phpdbg_write("|-------- C%lu -------> [", literal); + zend_print_zval( + &ops->literals[literal].constant, 0); + phpdbg_write("]"); + phpdbg_writeln(EMPTY); + } literal++; } } else {

« previous php.cvs (#74683) next »