]> granicus.if.org Git - php/commitdiff
Fixed refcounting
authorDmitry Stogov <dmitry@zend.com>
Thu, 20 Mar 2014 20:34:26 +0000 (00:34 +0400)
committerDmitry Stogov <dmitry@zend.com>
Thu, 20 Mar 2014 20:34:26 +0000 (00:34 +0400)
Zend/zend_execute_API.c

index 4ffa199d4494010aae181b0a9504c79edf5f5975..b3dc41ac1af72400ec4ecae9aa8e338c801e27c2 100644 (file)
@@ -640,6 +640,7 @@ ZEND_API int zval_update_constant_ex(zval *p, void *arg, zend_class_entry *scope
 
                        switch (Z_TYPE(const_value)) {
                                case IS_STRING:
+                                       Z_ADDREF(const_value);
                                        ret = zend_symtable_update_current_key(Z_ARRVAL_P(p), Z_STR(const_value), HASH_UPDATE_KEY_IF_BEFORE);
                                        break;
                                case IS_BOOL:
@@ -659,7 +660,7 @@ ZEND_API int zval_update_constant_ex(zval *p, void *arg, zend_class_entry *scope
                        if (ret == SUCCESS) {
                                zend_hash_move_forward(Z_ARRVAL_P(p));
                        }
-                       zval_dtor(&const_value);
+                       zval_ptr_dtor(&const_value);
                }
                zend_hash_apply_with_argument(Z_ARRVAL_P(p), (apply_func_arg_t) zval_update_constant_inline_change, (void *) scope TSRMLS_CC);
                zend_hash_internal_pointer_reset(Z_ARRVAL_P(p));