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 table map event processing

Browse Source 
The table name is also null-terminated so the length plus one byte needs
to be skipped.

If the table map event is not used immediately after the event is read,
the column types would point to possibly freed memory. To avoid this,
memory should be allocated for it.
This commit is contained in:
Markus Mäkelä
2019-01-02 07:28:45 +02:00
parent 3b3b492901
commit cb013c2c3d
2 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/mariadb_rpl.h
View File

@@ -205,7 +205,7 @@ struct st_mariadb_rpl_table_map_event {
MARIADB_STRING database; MARIADB_STRING database;
MARIADB_STRING table; MARIADB_STRING table;
unsigned int column_count; unsigned int column_count;
char *column_types; MARIADB_STRING column_types;
MARIADB_STRING metadata; MARIADB_STRING metadata;
char *null_indicator; char *null_indicator;
}; };

6
libmariadb/mariadb_rpl.c
View File

@@ -246,8 +246,10 @@ MARIADB_RPL_EVENT * STDCALL mariadb_rpl_fetch(MARIADB_RPL *rpl, MARIADB_RPL_EVEN
goto mem_error; goto mem_error;
ev+= len + 1; ev+= len + 1;
rpl_event->event.table_map.column_count= mysql_net_field_length(&ev); rpl_event->event.table_map.column_count= mysql_net_field_length(&ev);
rpl_event->event.table_map.column_types= (char *)ev; len= rpl_event->event.table_map.column_count;
ev+= rpl_event->event.table_map.column_count; if (rpl_alloc_string(rpl_event, &rpl_event->event.table_map.column_types, ev, len))
goto mem_error;
ev+= len;
len= mysql_net_field_length(&ev); len= mysql_net_field_length(&ev);
if (rpl_alloc_string(rpl_event, &rpl_event->event.table_map.metadata, ev, len)) if (rpl_alloc_string(rpl_event, &rpl_event->event.table_map.metadata, ev, len))
goto mem_error; goto mem_error;