diff options
| author | Nikita Popov <nikita.ppv@gmail.com> | 2020-12-14 12:28:26 +0100 |
|---|---|---|
| committer | Nikita Popov <nikita.ppv@gmail.com> | 2020-12-14 12:28:26 +0100 |
| commit | 35d752f4fca67036b8b1ff5b337cbf31fbf0fe5c (patch) | |
| tree | c407232ab96824b2e7bc3dafa6b5c45ef7c1b5f9 /ext/mysqlnd/mysqlnd_result_meta.c | |
| parent | 141eb346b035c3e9c620e01139b4ea3e7c6138f4 (diff) | |
| download | php-git-35d752f4fca67036b8b1ff5b337cbf31fbf0fe5c.tar.gz | |
Remove more OOM checks
Diffstat (limited to 'ext/mysqlnd/mysqlnd_result_meta.c')
| -rw-r--r-- | ext/mysqlnd/mysqlnd_result_meta.c | 25 |
1 files changed, 11 insertions, 14 deletions
diff --git a/ext/mysqlnd/mysqlnd_result_meta.c b/ext/mysqlnd/mysqlnd_result_meta.c index 1cbc438b44..909353c65a 100644 --- a/ext/mysqlnd/mysqlnd_result_meta.c +++ b/ext/mysqlnd/mysqlnd_result_meta.c @@ -289,20 +289,17 @@ mysqlnd_result_meta_init(MYSQLND_RES *result, unsigned int field_count) MYSQLND_RES_METADATA *ret; DBG_ENTER("mysqlnd_result_meta_init"); - do { - ret = result->memory_pool->get_chunk(result->memory_pool, alloc_size); - memset(ret, 0, alloc_size); - ret->m = & mysqlnd_mysqlnd_res_meta_methods; - - ret->field_count = field_count; - /* +1 is to have empty marker at the end */ - alloc_size = (field_count + 1) * sizeof(MYSQLND_FIELD); - ret->fields = result->memory_pool->get_chunk(result->memory_pool, alloc_size); - memset(ret->fields, 0, alloc_size); - DBG_INF_FMT("meta=%p", ret); - DBG_RETURN(ret); - } while (0); - DBG_RETURN(NULL); + ret = result->memory_pool->get_chunk(result->memory_pool, alloc_size); + memset(ret, 0, alloc_size); + ret->m = & mysqlnd_mysqlnd_res_meta_methods; + + ret->field_count = field_count; + /* +1 is to have empty marker at the end */ + alloc_size = (field_count + 1) * sizeof(MYSQLND_FIELD); + ret->fields = result->memory_pool->get_chunk(result->memory_pool, alloc_size); + memset(ret->fields, 0, alloc_size); + DBG_INF_FMT("meta=%p", ret); + DBG_RETURN(ret); } /* }}} */ |