diff options
| author | Zeev Suraski <zeev@php.net> | 2000-02-19 19:21:45 +0000 |
|---|---|---|
| committer | Zeev Suraski <zeev@php.net> | 2000-02-19 19:21:45 +0000 |
| commit | ceba50b6edc03128c29dfa96bfcb93d299654710 (patch) | |
| tree | e4b7da9e953001a1d926c521d38ee16ca36daf25 /Zend/zend_API.c | |
| parent | eb9d7998769d6bafcdf28b61257ed16528b5d7b2 (diff) | |
| download | php-git-ceba50b6edc03128c29dfa96bfcb93d299654710.tar.gz | |
- Fix a nasty bug in the hash, introduced in the recent migration to macros
- Make array_init() and friends trackable
Diffstat (limited to 'Zend/zend_API.c')
| -rw-r--r-- | Zend/zend_API.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/Zend/zend_API.c b/Zend/zend_API.c index 8e5cd4acad..d7c5f2761f 100644 --- a/Zend/zend_API.c +++ b/Zend/zend_API.c @@ -186,9 +186,9 @@ ZEND_API void wrong_param_count() } -ZEND_API inline int array_init(zval *arg) +ZEND_API inline int _array_init(zval *arg ZEND_FILE_LINE_DC) { - ALLOC_HASHTABLE(arg->value.ht); + ALLOC_HASHTABLE_REL(arg->value.ht); if (!arg->value.ht || zend_hash_init(arg->value.ht, 0, NULL, ZVAL_PTR_DTOR, 0)) { zend_error(E_CORE_ERROR, "Cannot allocate memory for array"); @@ -199,7 +199,7 @@ ZEND_API inline int array_init(zval *arg) } -ZEND_API inline int object_init_ex(zval *arg, zend_class_entry *class_type) +ZEND_API inline int _object_init_ex(zval *arg, zend_class_entry *class_type ZEND_FILE_LINE_DC) { zval *tmp; @@ -208,7 +208,7 @@ ZEND_API inline int object_init_ex(zval *arg, zend_class_entry *class_type) class_type->constants_updated = 1; } - ALLOC_HASHTABLE(arg->value.obj.properties); + ALLOC_HASHTABLE_REL(arg->value.obj.properties); zend_hash_init(arg->value.obj.properties, 0, NULL, ZVAL_PTR_DTOR, 0); zend_hash_copy(arg->value.obj.properties, &class_type->default_properties, (copy_ctor_func_t) zval_add_ref, (void *) &tmp, sizeof(zval *)); arg->type = IS_OBJECT; @@ -217,9 +217,9 @@ ZEND_API inline int object_init_ex(zval *arg, zend_class_entry *class_type) } -ZEND_API inline int object_init(zval *arg) +ZEND_API inline int _object_init(zval *arg ZEND_FILE_LINE_DC) { - return object_init_ex(arg, &zend_standard_class_def); + return _object_init_ex(arg, &zend_standard_class_def ZEND_FILE_LINE_CC); } |