- Another has optimization/fix like the hash_copy one from earlier on

diff --git a/Zend/zend_hash.c b/Zend/zend_hash.c
index 280fc0b6796b42364454b3979b1f4ddb8a51fe20..baca3bc17ce380ff35e9e065ed4c47af48f48d35 100644 (file)
--- a/Zend/zend_hash.c
+++ b/Zend/zend_hash.c
@@ -782,13 +782,12 @@ ZEND_API void zend_hash_merge(HashTable *target, HashTable *source, copy_ctor_fu
 
     p = source->pListHead;
        while (p) {
-               memcpy(tmp, p->pData, size);
                if (p->nKeyLength>0) {
-                       if (zend_hash_add_or_update(target, p->arKey, p->nKeyLength, tmp, size, &t, mode)==SUCCESS && pCopyConstructor) {
+                       if (zend_hash_add_or_update(target, p->arKey, p->nKeyLength, p->pData, size, &t, mode)==SUCCESS && pCopyConstructor) {
                                pCopyConstructor(t);
                        }
                } else {
-                       if ((mode==HASH_UPDATE || !zend_hash_index_exists(target, p->h)) && zend_hash_index_update(target, p->h, tmp, size, &t)==SUCCESS && pCopyConstructor) {
+                       if ((mode==HASH_UPDATE || !zend_hash_index_exists(target, p->h)) && zend_hash_index_update(target, p->h, p->pData, size, &t)==SUCCESS && pCopyConstructor) {
                                pCopyConstructor(t);
                        }
                }