diff options
| author | Andi Gutmans <andi@php.net> | 1999-06-09 19:26:54 +0000 |
|---|---|---|
| committer | Andi Gutmans <andi@php.net> | 1999-06-09 19:26:54 +0000 |
| commit | 7ed492344126557e111e462675a5a4d93114ea0d (patch) | |
| tree | c8eebeaf06a9c4263537c246b89f55475b641949 /Zend/zend_operators.c | |
| parent | 835b0d8823a9a9fdb7b1903fcbe193256b5fe1a2 (diff) | |
| download | php-git-7ed492344126557e111e462675a5a4d93114ea0d.tar.gz | |
- Fix the static array() initializing
Diffstat (limited to 'Zend/zend_operators.c')
| -rw-r--r-- | Zend/zend_operators.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Zend/zend_operators.c b/Zend/zend_operators.c index 364848bf08..b88c52cded 100644 --- a/Zend/zend_operators.c +++ b/Zend/zend_operators.c @@ -431,9 +431,9 @@ ZEND_API int add_function(zval *result, zval *op1, zval *op2) if (op1->type == IS_ARRAY && op2->type == IS_ARRAY) { zval tmp; - zend_hash_merge(op1->value.ht,op2->value.ht,(void (*)(void *pData)) zval_copy_ctor, (void *) &tmp, sizeof(zval), 0); *result = *op1; - zval_dtor(op2); + zval_copy_ctor(result); + zend_hash_merge(result->value.ht,op2->value.ht,(void (*)(void *pData)) zval_copy_ctor, (void *) &tmp, sizeof(zval), 0); return SUCCESS; } zendi_convert_scalar_to_number(op1, op1_copy); |