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

Fix for CONC-626:

Browse Source 
Fixed possible memory leak in mariadb_stmt_execute if realloc of
data buffer failed.
This commit is contained in:
Georg Richter
2023-01-16 08:11:02 +01:00
parent bf82b2d8cb
commit 173112ceaf
1 changed files with 12 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
libmariadb/mariadb_stmt.c
View File

@@ -715,6 +715,7 @@ unsigned char* mysql_stmt_execute_generate_simple_request(MYSQL_STMT *stmt, size
size_t length= 1024; size_t length= 1024;
size_t free_bytes= 0; size_t free_bytes= 0;
size_t null_byte_offset= 0; size_t null_byte_offset= 0;
uchar *tmp_start;
uint i; uint i;
uchar *start= NULL, *p; uchar *start= NULL, *p;
@@ -743,8 +744,9 @@ unsigned char* mysql_stmt_execute_generate_simple_request(MYSQL_STMT *stmt, size
{ {
size_t offset= p - start; size_t offset= p - start;
length+= offset + null_count + 20; length+= offset + null_count + 20;
if (!(start= (uchar *)realloc(start, length))) if (!(tmp_start= (uchar *)realloc(start, length)))
goto mem_error; goto mem_error;
start= tmp_start;
p= start + offset; p= start + offset;
} }
@@ -766,8 +768,9 @@ unsigned char* mysql_stmt_execute_generate_simple_request(MYSQL_STMT *stmt, size
{ {
size_t offset= p - start; size_t offset= p - start;
length= offset + stmt->param_count * 2 + 20; length= offset + stmt->param_count * 2 + 20;
if (!(start= (uchar *)realloc(start, length))) if (!(tmp_start= (uchar *)realloc(start, length)))
goto mem_error; goto mem_error;
start= tmp_start;
p= start + offset; p= start + offset;
} }
for (i = 0; i < stmt->param_count; i++) for (i = 0; i < stmt->param_count; i++)
@@ -836,8 +839,9 @@ unsigned char* mysql_stmt_execute_generate_simple_request(MYSQL_STMT *stmt, size
{ {
size_t offset= p - start; size_t offset= p - start;
length= MAX(2 * length, offset + size + 20); length= MAX(2 * length, offset + size + 20);
if (!(start= (uchar *)realloc(start, length))) if (!(tmp_start= (uchar *)realloc(start, length)))
goto mem_error; goto mem_error;
start= tmp_start;
p= start + offset; p= start + offset;
} }
if (((stmt->params[i].is_null && *stmt->params[i].is_null) || if (((stmt->params[i].is_null && *stmt->params[i].is_null) ||
@@ -910,6 +914,7 @@ unsigned char* mysql_stmt_execute_generate_bulk_request(MYSQL_STMT *stmt, size_t
size_t length= 1024; size_t length= 1024;
size_t free_bytes= 0; size_t free_bytes= 0;
ushort flags= 0; ushort flags= 0;
uchar *tmp_start;
uint i, j; uint i, j;
uchar *start= NULL, *p; uchar *start= NULL, *p;
@@ -961,8 +966,9 @@ unsigned char* mysql_stmt_execute_generate_bulk_request(MYSQL_STMT *stmt, size_t
{ {
size_t offset= p - start; size_t offset= p - start;
length= offset + stmt->param_count * 2 + 20; length= offset + stmt->param_count * 2 + 20;
if (!(start= (uchar *)realloc(start, length))) if (!(tmp_start= (uchar *)realloc(start, length)))
goto mem_error; goto mem_error;
start= tmp_start;
p= start + offset; p= start + offset;
} }
for (i = 0; i < stmt->param_count; i++) for (i = 0; i < stmt->param_count; i++)
@@ -1047,8 +1053,9 @@ unsigned char* mysql_stmt_execute_generate_bulk_request(MYSQL_STMT *stmt, size_t
{ {
size_t offset= p - start; size_t offset= p - start;
length= MAX(2 * length, offset + size + 20); length= MAX(2 * length, offset + size + 20);
if (!(start= (uchar *)realloc(start, length))) if (!(tmp_start= (uchar *)realloc(start, length)))
goto mem_error; goto mem_error;
start= tmp_start;
p= start + offset; p= start + offset;
} }