X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-http;a=blobdiff_plain;f=src%2Fphp_http_message_body.c;h=97b1a148bf3ae87c9b3984530cd563b3b7133b55;hp=b2e643be4b39491f4b4f90865e76edd530cdf06c;hb=8f8c6de6ae23ee114c9fac41d82ae866c1747132;hpb=50eaea1dac2be9bff7990a6f669b5b6dacc6889e diff --git a/src/php_http_message_body.c b/src/php_http_message_body.c index b2e643b..97b1a14 100644 --- a/src/php_http_message_body.c +++ b/src/php_http_message_body.c @@ -330,7 +330,7 @@ static inline char *format_key(php_http_arrkey_t *key, const char *prefix) { } else if (key->key) { new_key = estrdup(key->key->val); } else { - new_key = estrdup(""); + spprintf(&new_key, 0, "%lu", key->h); } return new_key; @@ -392,14 +392,17 @@ static ZEND_RESULT_CODE add_recursive_files(php_http_message_body_t *body, const ZEND_HASH_FOREACH_KEY_VAL_IND(files, key.h, key.key, val) { if (Z_TYPE_P(val) == IS_ARRAY || Z_TYPE_P(val) == IS_OBJECT) { - char *str = format_key(&key, name); + char *str = key.key ? format_key(&key, name) : NULL; + const char *prefix = str ? str : name; - if (SUCCESS != add_recursive_files(body, str, HASH_OF(val))) { + if (SUCCESS != add_recursive_files(body, prefix, HASH_OF(val))) { efree(str); HT_UNPROTECT_RECURSION(files); return FAILURE; } - efree(str); + if (str) { + efree(str); + } } } ZEND_HASH_FOREACH_END();