fix appending an array to another

Author: Frederick888

bdict.cc

@@ -329,10 +329,10 @@ zval * bdict::search(const std::string &needle, const long &mode, const std::str
 
         if (class_name == "bdict") {
             zval *next_result = (zend_container::bdict_fetch_object(Z_OBJ_P(value)))->bdict_data->search(needle, mode, current_path);
-            zend_hash_merge(Z_ARRVAL_P(zv), Z_ARRVAL_P(next_result), (copy_ctor_func_t) zval_add_ref, false);
+            zend_hash_append_strings(Z_ARRVAL_P(zv), Z_ARRVAL_P(next_result));
         } else if (class_name == "blist") {
             zval *next_result = (zend_container::blist_fetch_object(Z_OBJ_P(value)))->blist_data->search(needle, mode, current_path);
-            zend_hash_merge(Z_ARRVAL_P(zv), Z_ARRVAL_P(next_result), (copy_ctor_func_t) zval_add_ref, false);
+            zend_hash_append_strings(Z_ARRVAL_P(zv), Z_ARRVAL_P(next_result));
         } else if (modev && class_name == "bstr") {
             if ((zend_container::bstr_fetch_object(Z_OBJ_P(value)))->bstr_data->_value.find(needle) != std::string::npos)
                 add_next_index_string(zv, current_path.c_str());

bitem.cc

@@ -62,6 +62,18 @@ bool bitem::is_ll(const std::string &s) {
     return (*p == 0);
 }
 
+void bitem::zend_hash_append_strings(HashTable *target, HashTable *source) {
+    for(zend_hash_internal_pointer_reset(source);
+            zend_hash_has_more_elements(source) == SUCCESS;
+            zend_hash_move_forward(source)) {
+        zend_string *_str_index;
+        zend_ulong num_index;
+        zend_hash_get_current_key(source, &_str_index, &num_index);
+        zval *value = zend_hash_get_current_data(source);
+        zend_hash_next_index_insert(target, value);
+    }
+}
+
 std::string bitem::get_type() const {
     return "bitem";
 }

bitem.h

@@ -18,6 +18,7 @@ class bitem {
         static std::string escape_key(const std::string &key);
         static bool is_ull(const std::string &s);
         static bool is_ll(const std::string &s);
+        static void zend_hash_append_strings(HashTable *target, HashTable *source);
 
     public:
         bitem() {}

blist.cc

@@ -344,10 +344,10 @@ zval * blist::search(const std::string &needle, const long &mode, const std::str
 
         if (class_name == "bdict") {
             zval *next_result = (zend_container::bdict_fetch_object(Z_OBJ_P(value)))->bdict_data->search(needle, mode, current_path);
-            zend_hash_merge(Z_ARRVAL_P(zv), Z_ARRVAL_P(next_result), (copy_ctor_func_t) zval_add_ref, false);
+            zend_hash_append_strings(Z_ARRVAL_P(zv), Z_ARRVAL_P(next_result));
         } else if (class_name == "blist") {
             zval *next_result = (zend_container::blist_fetch_object(Z_OBJ_P(value)))->blist_data->search(needle, mode, current_path);
-            zend_hash_merge(Z_ARRVAL_P(zv), Z_ARRVAL_P(next_result), (copy_ctor_func_t) zval_add_ref, false);
+            zend_hash_append_strings(Z_ARRVAL_P(zv), Z_ARRVAL_P(next_result));
         } else if (modev && class_name == "bstr") {
             if ((zend_container::bstr_fetch_object(Z_OBJ_P(value)))->bstr_data->_value.find(needle) != std::string::npos)
                 add_next_index_string(zv, current_path.c_str());