com php-src: Fix assertion failure with Z_REFCOUNT() in info constants: sapi/phpdbg/phpdbg_info.c

Commit: b34f9bc2e9df124c790d14b98c7746246d108e3d Author: Bob Weinand <bobwei9@hotmail.com> Mon, 29 Jun 2015 03:43:36 +0200 Parents: 01ceb0f7fa374af225bc75198d2c09921611cd83 Branches: master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=b34f9bc2e9df124c790d14b98c7746246d108e3d Log: Fix assertion failure with Z_REFCOUNT() in info constants Changed paths: M sapi/phpdbg/phpdbg_info.c Diff: diff --git a/sapi/phpdbg/phpdbg_info.c b/sapi/phpdbg/phpdbg_info.c index f34485d..7b957ad 100644 --- a/sapi/phpdbg/phpdbg_info.c +++ b/sapi/phpdbg/phpdbg_info.c @@ -120,7 +120,7 @@ PHPDBG_INFO(constants) /* {{{ */ phpdbg_out("Address Refs Type Constant\n"); ZEND_HASH_FOREACH_PTR(&consts, data) { -#define VARIABLEINFO(attrs, msg, ...) phpdbg_writeln("constant", "address=\"%p\" refcount=\"%d\" type=\"%s\" name=\"%.*s\" " attrs, "%-18p %-7d %-9s %..*s" msg, &data->value, Z_REFCOUNT(data->value), zend_zval_type_name(&data->value), data->name->len, data->name->val, ##__VA_ARGS__) +#define VARIABLEINFO(attrs, msg, ...) phpdbg_writeln("constant", "address=\"%p\" refcount=\"%d\" type=\"%s\" name=\"%.*s\" " attrs, "%-18p %-7d %-9s %.*s" msg, &data->value, Z_REFCOUNTED(data->value) ? Z_REFCOUNT(data->value) : 1, zend_zval_type_name(&data->value), data->name->len, data->name->val, ##__VA_ARGS__) switch (Z_TYPE(data->value)) { case IS_STRING: