From f8e9265e730c67499c005cf1d05bbded257f5fe5 Mon Sep 17 00:00:00 2001 From: Michael Wallner Date: Wed, 16 Apr 2014 20:06:50 +0200 Subject: [PATCH] fix assertion fail on zend_hash_quick_update --- php_http_env_request.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/php_http_env_request.c b/php_http_env_request.c index f2b8bf2..6aff0c0 100644 --- a/php_http_env_request.c +++ b/php_http_env_request.c @@ -96,7 +96,11 @@ static int grab_files(void *zpp TSRMLS_DC, int argc, va_list argv, zend_hash_key add_assoc_zval_ex(cpy, ZEND_STRS("file"), *tmp); zend_hash_del_key_or_index(Z_ARRVAL_P(cpy), ZEND_STRS("tmp_name"), 0, HASH_DEL_KEY); } - zend_hash_quick_update(Z_ARRVAL_P(zfiles), key->arKey, key->nKeyLength, key->h, (void *) &cpy, sizeof(zval *), NULL); + if (key->nKeyLength > 0) { + zend_hash_quick_update(Z_ARRVAL_P(zfiles), key->arKey, key->nKeyLength, key->h, (void *) &cpy, sizeof(zval *), NULL); + } else { + zend_hash_index_update(Z_ARRVAL_P(zfiles), key->h, (void *) &cpy, sizeof(zval *), NULL); + } } } -- 2.30.2