summaryrefslogtreecommitdiff
path: root/ext/mysqlnd/mysqlnd_wireprotocol.c
diff options
context:
space:
mode:
authorDmitry Stogov <dmitry@zend.com>2017-11-15 14:07:09 +0300
committerDmitry Stogov <dmitry@zend.com>2017-11-15 14:07:09 +0300
commit6bcace1b729f48ad378d36c4bba9e576f5f3896e (patch)
tree3115049844dc58f20a07f32e0197d143b6c4864d /ext/mysqlnd/mysqlnd_wireprotocol.c
parenta0724819c2a370b64f85bebce396ff0047c878b8 (diff)
downloadphp-git-6bcace1b729f48ad378d36c4bba9e576f5f3896e.tar.gz
Use single memory pool for result metadata and result set.
Diffstat (limited to 'ext/mysqlnd/mysqlnd_wireprotocol.c')
-rw-r--r--ext/mysqlnd/mysqlnd_wireprotocol.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/ext/mysqlnd/mysqlnd_wireprotocol.c b/ext/mysqlnd/mysqlnd_wireprotocol.c
index a3b1a1b13e..b7b486c349 100644
--- a/ext/mysqlnd/mysqlnd_wireprotocol.c
+++ b/ext/mysqlnd/mysqlnd_wireprotocol.c
@@ -1290,7 +1290,7 @@ php_mysqlnd_rset_field_read(MYSQLND_CONN_DATA * conn, void * _packet)
{
BAIL_IF_NO_MORE_DATA;
DBG_INF_FMT("Def found, length %lu", len);
- meta->def = mnd_emalloc(len + 1);
+ meta->def = packet->memory_pool->get_chunk(packet->memory_pool, len + 1);
if (!meta->def) {
SET_OOM_ERROR(error_info);
DBG_RETURN(FAIL);
@@ -1301,7 +1301,7 @@ php_mysqlnd_rset_field_read(MYSQLND_CONN_DATA * conn, void * _packet)
p += len;
}
- root_ptr = meta->root = mnd_emalloc(total_len);
+ root_ptr = meta->root = packet->memory_pool->get_chunk(packet->memory_pool, total_len);
if (!root_ptr) {
SET_OOM_ERROR(error_info);
DBG_RETURN(FAIL);