From: Nikita Popov <nikita.ppv@gmail.com>
Date: Mon, 14 Dec 2020 12:42:38 +0000 (+0100)
Subject: Use zmm for row_c data
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=3c63b26b6d576b0091ac978012e4756fe7946c12;p=php

Use zmm for row_c data

This API already doesn't match libmysqlclient, so we may as well
use the zmm.
---

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 = &current_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;