diff options
| author | Zeev Suraski <zeev@php.net> | 1999-05-29 18:59:58 +0000 |
|---|---|---|
| committer | Zeev Suraski <zeev@php.net> | 1999-05-29 18:59:58 +0000 |
| commit | bcc1337d8c7f9500241b5dbcd2ad02367a474884 (patch) | |
| tree | 78f4c9e077dfc48c27a56615410101d01235d634 /Zend/zend_operators.c | |
| parent | 274f3aa727055eb5698f5131439af15451e806e5 (diff) | |
| download | php-git-bcc1337d8c7f9500241b5dbcd2ad02367a474884.tar.gz | |
Support overwrite mode in zend_hash_merge()
Diffstat (limited to 'Zend/zend_operators.c')
| -rw-r--r-- | Zend/zend_operators.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Zend/zend_operators.c b/Zend/zend_operators.c index 162a634162..8b83162d4d 100644 --- a/Zend/zend_operators.c +++ b/Zend/zend_operators.c @@ -431,7 +431,7 @@ 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)); + 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); return SUCCESS; |