Use simpler functions

diff --git a/Zend/zend_execute_API.c b/Zend/zend_execute_API.c
index 480206bfb5917b0a37bd7779d6d8823a1b3e8b5a..657a261d543ba71781c259148339d1ef6ab26665 100644 (file)
--- a/Zend/zend_execute_API.c
+++ b/Zend/zend_execute_API.c
@@ -1471,17 +1471,14 @@ ZEND_API void zend_attach_symbol_table(zend_execute_data *execute_data) /* {{{ *
                if (zv) {
                        if (Z_TYPE_P(zv) == IS_INDIRECT) {
                                zval *val = Z_INDIRECT_P(zv);
-                               if (Z_TYPE_P(val) == IS_UNDEF) {
-                                       ZVAL_UNDEF(EX_VAR_NUM(i));
-                               } else {
-                                       ZVAL_COPY_VALUE(EX_VAR_NUM(i), val);
-                               }
+
+                               ZVAL_COPY_VALUE(EX_VAR_NUM(i), val);
                        } else {
                                ZVAL_COPY_VALUE(EX_VAR_NUM(i), zv);
                        }
                } else {
                        ZVAL_UNDEF(EX_VAR_NUM(i));
-                       zv = zend_hash_update(ht, op_array->vars[i], EX_VAR_NUM(i));
+                       zv = zend_hash_add_new(ht, op_array->vars[i], EX_VAR_NUM(i));
                }
                ZVAL_INDIRECT(zv, EX_VAR_NUM(i));
        }

diff --git a/Zend/zend_objects.c b/Zend/zend_objects.c
index 2778b168ee60319ccf97e66a94fcbe747e009092..69b5df2eab61e23f331ebb362dc798b82fb627d9 100644 (file)
--- a/Zend/zend_objects.c
+++ b/Zend/zend_objects.c
@@ -167,9 +167,9 @@ ZEND_API void zend_objects_clone_members(zend_object *new_object, zend_object *o
                                zval_add_ref(&new_prop);
                        }
                        if (key) {
-                               zend_hash_update(new_object->properties, key, &new_prop);
+                               zend_hash_add_new(new_object->properties, key, &new_prop);
                        } else {
-                               zend_hash_index_update(new_object->properties, num_key, &new_prop);
+                               zend_hash_index_add_new(new_object->properties, num_key, &new_prop);
                        }
                } ZEND_HASH_FOREACH_END();
        }