com php-src: Use zmm for row_c data: ext/mysqlnd/mysqln d_result.c ext/pdo_mysql/mysql_statement.c
| From: | Nikita Popov | Date: | Mon, 14 Dec 2020 12:43:30 +0000 |
| Subject: | com php-src: Use zmm for row_c data: ext/mysqlnd/mysqln d_result.c ext/pdo_mysql/mysql_statement.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-114440@lists.php.net to get a copy of this message | ||
Commit: 3c63b26b6d576b0091ac978012e4756fe7946c12
Author: Nikita Popov <nikita.ppv@gmail.com> Mon, 14 Dec 2020 13:42:38 +0100
Parents: f1e2cd862590e440f31c4becacc47263114c4950
Branches: master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=3c63b26b6d576b0091ac978012e4756fe7946c12
Log:
Use zmm for row_c data
This API already doesn't match libmysqlclient, so we may as well
use the zmm.
Changed paths:
M ext/mysqlnd/mysqlnd_result.c
M ext/pdo_mysql/mysql_statement.c
Diff:
diff --git a/ext/mysqlnd/mysqlnd_result.c b/ext/mysqlnd/mysqlnd_result.c
index bfcff5a088d..3dd09939acf 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 95c5c4bbd52..3da45660683 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;