database/mariadb-connector-c
1
0
Fork 0
mirror of https://github.com/mariadb-corporation/mariadb-connector-c.git synced 2025-08-07 02:42:49 +03:00
Code Activity

Merge branch '3.1' into 3.2

Browse Source
This commit is contained in:
Georg Richter
2021-10-05 15:19:59 +02:00
parent 5b47e0c528 ae9f14534c
commit 2933a1ca75
7 changed files with 162 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
libmariadb/mariadb_stmt.c
View File

@@ -1645,6 +1645,7 @@ my_bool mthd_stmt_read_prepare_response(MYSQL_STMT *stmt)
if (stmt->prebind_params != stmt->param_count)
{
SET_CLIENT_STMT_ERROR(stmt, CR_INVALID_PARAMETER_NO, SQLSTATE_UNKNOWN, 0);
stmt->param_count= stmt->prebind_params;
return 1;
}
} else {
@@ -1931,6 +1932,13 @@ int mthd_stmt_read_execute_response(MYSQL_STMT *stmt)
{
SET_CLIENT_STMT_ERROR(stmt, mysql->net.last_errno, mysql->net.sqlstate,
mysql->net.last_error);
/* if mariadb_stmt_execute_direct was used, we need to send the number
of parameters to the specified prebinded value to prevent possible
memory overrun */
if (stmt->prebind_params)
{
stmt->param_count= stmt->prebind_params;
}
stmt->state= MYSQL_STMT_PREPARED;
return(1);
}