]> granicus.if.org Git - php/commitdiff
Fix assertion failure with Z_REFCOUNT() in info constants
authorBob Weinand <bobwei9@hotmail.com>
Mon, 29 Jun 2015 01:43:36 +0000 (03:43 +0200)
committerBob Weinand <bobwei9@hotmail.com>
Mon, 29 Jun 2015 01:43:51 +0000 (03:43 +0200)
sapi/phpdbg/phpdbg_info.c

index f34485d6b5ed4d210781e8b5accafde2c702a0f6..7b957ad54010563fee3eb1e2df4aa55a89d81c14 100644 (file)
@@ -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: