X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-http;a=blobdiff_plain;f=php_http_misc.c;h=8e2227da1db0ec1a17135123ff09f7e657d719d0;hp=c6e22700fdafeda8ada5baf65ec2eb74fa181095;hb=refs%2Fheads%2Fv2.4.x;hpb=b54d9ed0b0cd930f76754fe281e66f36a953085b

diff --git a/php_http_misc.c b/php_http_misc.c
index c6e2270..8e2227d 100644
--- a/php_http_misc.c
+++ b/php_http_misc.c
@@ -188,8 +188,10 @@ int php_http_array_apply_append_func(void *pDest TSRMLS_DC, int num_args, va_lis
 		if ((flags & ARRAY_JOIN_PRETTIFY) && hash_key->nKeyLength) {
 			key = php_http_pretty_key(estrndup(hash_key->arKey, hash_key->nKeyLength - 1), hash_key->nKeyLength - 1, 1, 1);
 			zend_hash_find(dst, key, hash_key->nKeyLength, (void *) &data);
-		} else {
+		} else if (hash_key->nKeyLength) {
 			zend_hash_quick_find(dst, hash_key->arKey, hash_key->nKeyLength, hash_key->h, (void *) &data);
+		} else {
+			zend_hash_index_find(dst, hash_key->h, (void *) &data);
 		}
 
 		if (flags & ARRAY_JOIN_STRINGIFY) {
@@ -205,8 +207,10 @@ int php_http_array_apply_append_func(void *pDest TSRMLS_DC, int num_args, va_lis
 			add_next_index_zval(*data, value);
 		} else if (key) {
 			zend_symtable_update(dst, key, hash_key->nKeyLength, &value, sizeof(zval *), NULL);
-		} else {
+		} else if (hash_key->nKeyLength) {
 			zend_hash_quick_add(dst, hash_key->arKey, hash_key->nKeyLength, hash_key->h, &value, sizeof(zval *), NULL);
+		} else {
+			zend_hash_index_update(dst, hash_key->h, (void *) &value, sizeof(zval *), NULL);
 		}
 
 		if (key) {
@@ -238,8 +242,10 @@ int php_http_array_apply_merge_func(void *pDest TSRMLS_DC, int num_args, va_list
 			key = php_http_pretty_key(estrndup(hash_key->arKey, hash_key->nKeyLength - 1), hash_key->nKeyLength - 1, 1, 1);
 			zend_hash_update(dst, key, hash_key->nKeyLength, (void *) &value, sizeof(zval *), NULL);
 			efree(key);
-		} else {
+		} else if (hash_key->nKeyLength) {
 			zend_hash_quick_update(dst, hash_key->arKey, hash_key->nKeyLength, hash_key->h, (void *) &value, sizeof(zval *), NULL);
+		} else {
+			zend_hash_index_update(dst, hash_key->h, (void *) &value, sizeof(zval *), NULL);
 		}
 	}