Fix a valgrind warning: memcpy does not allow its arguments to overlap.
This commit is contained in:
parent
6adfd9436e
commit
6c981c0b80
@ -3944,9 +3944,12 @@ my_bool STDCALL mysql_stmt_bind_result(MYSQL_STMT *stmt, MYSQL_BIND *bind)
|
|||||||
/*
|
/*
|
||||||
We only need to check that stmt->field_count - if it is not null
|
We only need to check that stmt->field_count - if it is not null
|
||||||
stmt->bind was initialized in mysql_stmt_prepare
|
stmt->bind was initialized in mysql_stmt_prepare
|
||||||
*/
|
stmt->bind overlaps with bind if mysql_stmt_bind_param
|
||||||
|
is called from mysql_stmt_store_result.
|
||||||
|
*/
|
||||||
|
|
||||||
memcpy((char*) stmt->bind, (char*) bind, sizeof(MYSQL_BIND) * bind_count);
|
if (stmt->bind != bind)
|
||||||
|
memcpy((char*) stmt->bind, (char*) bind, sizeof(MYSQL_BIND) * bind_count);
|
||||||
|
|
||||||
for (param= stmt->bind, end= param + bind_count, field= stmt->fields ;
|
for (param= stmt->bind, end= param + bind_count, field= stmt->fields ;
|
||||||
param < end ;
|
param < end ;
|
||||||
|
Loading…
x
Reference in New Issue
Block a user