From 13b67621cfb4ba5fc71668f353f8128346e88904 Mon Sep 17 00:00:00 2001 From: Zeev Suraski Date: Wed, 31 May 2000 19:07:09 +0000 Subject: Fix a bug in static initializers/default values/class member variables that contained array values --- Zend/zend_variables.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'Zend/zend_variables.c') diff --git a/Zend/zend_variables.c b/Zend/zend_variables.c index 2fa87df02d..e1639a8ad8 100644 --- a/Zend/zend_variables.c +++ b/Zend/zend_variables.c @@ -61,7 +61,8 @@ ZEND_API void _zval_dtor(zval *zvalue ZEND_FILE_LINE_DC) case IS_CONSTANT: STR_FREE_REL(zvalue->value.str.val); break; - case IS_ARRAY: { + case IS_ARRAY: + case IS_CONSTANT_ARRAY: { ELS_FETCH(); if (zvalue->value.ht && (zvalue->value.ht != &EG(symbol_table))) { @@ -125,7 +126,8 @@ ZEND_API int _zval_copy_ctor(zval *zvalue ZEND_FILE_LINE_DC) } zvalue->value.str.val = (char *) estrndup_rel(zvalue->value.str.val, zvalue->value.str.len); break; - case IS_ARRAY: { + case IS_ARRAY: + case IS_CONSTANT_ARRAY: { zval *tmp; HashTable *original_ht = zvalue->value.ht; ELS_FETCH(); -- cgit v1.2.1