diff options
| -rw-r--r-- | Zend/zend_fast_cache.h | 2 | ||||
| -rw-r--r-- | Zend/zend_variables.c | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/Zend/zend_fast_cache.h b/Zend/zend_fast_cache.h index 3da1abdbaa..cd56506f7e 100644 --- a/Zend/zend_fast_cache.h +++ b/Zend/zend_fast_cache.h @@ -117,7 +117,7 @@ typedef struct _zend_fast_cache_list_entry { #define FREE_ZVAL_REL(z) \ ZEND_FAST_FREE_REL(z, ZVAL_CACHE_LIST) -/* fast cache for HashTable's */ +/* fast cache for HashTables */ #define ALLOC_HASHTABLE(ht) \ ZEND_FAST_ALLOC(ht, HashTable, HASHTABLE_CACHE_LIST) diff --git a/Zend/zend_variables.c b/Zend/zend_variables.c index f32da2e653..4ca0dc6dcb 100644 --- a/Zend/zend_variables.c +++ b/Zend/zend_variables.c @@ -136,7 +136,7 @@ ZEND_API int _zval_copy_ctor(zval *zvalue ZEND_FILE_LINE_DC) } else if (zvalue->value.ht==&EG(symbol_table)) { return SUCCESS; /* do nothing */ } - zvalue->value.ht = (HashTable *) emalloc_rel(sizeof(HashTable)); + ALLOC_HASHTABLE_REL(zvalue->value.ht); zend_hash_init(zvalue->value.ht, 0, NULL, ZVAL_PTR_DTOR, 0); zend_hash_copy(zvalue->value.ht, original_ht, (copy_ctor_func_t) zval_add_ref, (void *) &tmp, sizeof(zval *)); } @@ -145,7 +145,7 @@ ZEND_API int _zval_copy_ctor(zval *zvalue ZEND_FILE_LINE_DC) zval *tmp; HashTable *original_ht = zvalue->value.obj.properties; - zvalue->value.obj.properties = (HashTable *) emalloc_rel(sizeof(HashTable)); + ALLOC_HASHTABLE_REL(zvalue->value.obj.properties); zend_hash_init(zvalue->value.obj.properties, 0, NULL, ZVAL_PTR_DTOR, 0); zend_hash_copy(zvalue->value.obj.properties, original_ht, (copy_ctor_func_t) zval_add_ref, (void *) &tmp, sizeof(zval *)); } |