X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=src%2Fphp_http_params.c;h=90710684deabe6d08bd5e81d8e1563086f0095a6;hb=e595d8abe5b5a93e30bd7ffba6c13fad107ce08c;hp=fc75f0e96140151f52e918ec8136cbf9140c8304;hpb=e67b70752bcc37ccf96d512a81799298f707682e;p=m6w6%2Fext-http

diff --git a/src/php_http_params.c b/src/php_http_params.c
index fc75f0e..9071068 100644
--- a/src/php_http_params.c
+++ b/src/php_http_params.c
@@ -470,7 +470,7 @@ static void merge_param(HashTable *params, zval *zdata, zval ***current_param, z
 			while (Z_TYPE_PP(zdata_ptr) == IS_ARRAY
 			&&	SUCCESS == zend_hash_get_current_data(Z_ARRVAL_PP(zdata_ptr), (void *) &test_ptr)
 			) {
-				if (Z_TYPE_PP(test_ptr) == IS_ARRAY) {
+				if (Z_TYPE_PP(test_ptr) == IS_ARRAY && Z_TYPE_PP(ptr) == IS_ARRAY) {
 
 					/* now find key in ptr */
 					if (HASH_KEY_IS_STRING == zend_hash_get_current_key_ex(Z_ARRVAL_PP(zdata_ptr), &hkey.str, &hkey.len, &hkey.num, hkey.dup, NULL)) {