summaryrefslogtreecommitdiff
path: root/Zend/zend_execute_API.c
diff options
context:
space:
mode:
authorBob Weinand <bobwei9@hotmail.com>2016-05-05 23:31:57 +0200
committerBob Weinand <bobwei9@hotmail.com>2016-05-05 23:31:57 +0200
commitbac6fdb0c52c924e726c5a78de8858bf27b6586b (patch)
tree627f2ec8d91955e99456783aebd94ac5d4236f32 /Zend/zend_execute_API.c
parent59f35c0ca9abfa72c5393f6c0350759a3f6512d8 (diff)
downloadphp-git-bac6fdb0c52c924e726c5a78de8858bf27b6586b.tar.gz
Refactor zval cleanup into single function
Also use zval_ptr_dtor_nogc() everywhere in Zend in favor of zval_dtor()
Diffstat (limited to 'Zend/zend_execute_API.c')
-rw-r--r--Zend/zend_execute_API.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/Zend/zend_execute_API.c b/Zend/zend_execute_API.c
index d4e2d8527e..559a0ae3ae 100644
--- a/Zend/zend_execute_API.c
+++ b/Zend/zend_execute_API.c
@@ -1017,7 +1017,7 @@ ZEND_API zend_class_entry *zend_lookup_class_ex(zend_string *name, const zval *k
zend_exception_restore();
zval_ptr_dtor(&args[0]);
- zval_dtor(&fcall_info.function_name);
+ zval_ptr_dtor_nogc(&fcall_info.function_name);
zend_hash_del(EG(in_autoload), lc_name);
@@ -1127,7 +1127,7 @@ ZEND_API int zend_eval_stringl(char *str, size_t str_len, zval *retval_ptr, char
} else {
retval = FAILURE;
}
- zval_dtor(&pv);
+ zval_ptr_dtor_nogc(&pv);
return retval;
}
/* }}} */