From: Bob Weinand <bobwei9@hotmail.com>
Date: Mon, 29 Jun 2015 01:43:36 +0000 (+0200)
Subject: Fix assertion failure with Z_REFCOUNT() in info constants
X-Git-Tag: php-7.1.0alpha3~25^2~134
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=b34f9bc2e9df124c790d14b98c7746246d108e3d;p=php

Fix assertion failure with Z_REFCOUNT() in info constants
---

diff --git a/sapi/phpdbg/phpdbg_info.c b/sapi/phpdbg/phpdbg_info.c
index f34485d6b5..7b957ad540 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: