diff options
author | Nikita Popov <nikita.ppv@gmail.com> | 2020-12-14 13:42:38 +0100 |
---|---|---|
committer | Nikita Popov <nikita.ppv@gmail.com> | 2020-12-14 13:43:30 +0100 |
commit | 3c63b26b6d576b0091ac978012e4756fe7946c12 (patch) | |
tree | 1e13397f3628c26514cc92aa4a7aff4dd09bba23 /ext | |
parent | f1e2cd862590e440f31c4becacc47263114c4950 (diff) | |
download | php-git-3c63b26b6d576b0091ac978012e4756fe7946c12.tar.gz |
Use zmm for row_c data
This API already doesn't match libmysqlclient, so we may as well
use the zmm.
Diffstat (limited to 'ext')
-rw-r--r-- | ext/mysqlnd/mysqlnd_result.c | 4 | ||||
-rw-r--r-- | ext/pdo_mysql/mysql_statement.c | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/ext/mysqlnd/mysqlnd_result.c b/ext/mysqlnd/mysqlnd_result.c index bfcff5a088..3dd09939ac 100644 --- a/ext/mysqlnd/mysqlnd_result.c +++ b/ext/mysqlnd/mysqlnd_result.c @@ -695,7 +695,7 @@ MYSQLND_METHOD(mysqlnd_result_unbuffered, fetch_row_c)(MYSQLND_RES * result, voi DBG_RETURN(FAIL); } { - *row = mnd_malloc(field_count * sizeof(char *)); + *row = mnd_emalloc(field_count * sizeof(char *)); MYSQLND_FIELD * field = meta->fields; size_t * lengths = result->unbuf->lengths; @@ -991,7 +991,7 @@ MYSQLND_METHOD(mysqlnd_result_buffered, fetch_row_c)(MYSQLND_RES * result, void } /* BEGIN difference between normal normal fetch and _c */ - *row = mnd_malloc(field_count * sizeof(char *)); + *row = mnd_emalloc(field_count * sizeof(char *)); for (i = 0; i < field_count; ++i) { zval * data = ¤t_row[i]; diff --git a/ext/pdo_mysql/mysql_statement.c b/ext/pdo_mysql/mysql_statement.c index 95c5c4bbd5..3da4566068 100644 --- a/ext/pdo_mysql/mysql_statement.c +++ b/ext/pdo_mysql/mysql_statement.c @@ -106,7 +106,7 @@ static int pdo_mysql_stmt_dtor(pdo_stmt_t *stmt) /* {{{ */ #ifdef PDO_USE_MYSQLND if (!S->stmt && S->current_data) { - mnd_free(S->current_data); + mnd_efree(S->current_data); } #endif /* PDO_USE_MYSQLND */ @@ -554,7 +554,7 @@ static int pdo_mysql_stmt_fetch(pdo_stmt_t *stmt, enum pdo_fetch_orientation ori } if (!S->stmt && S->current_data) { - mnd_free(S->current_data); + mnd_efree(S->current_data); } #else int ret; |