Merge pull request #97 from markus456/3.1

Fix table map event processing
mariadb-corporation · Jan 18, 2019 · 78abc1d · 78abc1d
2 parents 3b3b492 + cb013c2
commit 78abc1d
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/include/mariadb_rpl.h b/include/mariadb_rpl.h
@@ -205,7 +205,7 @@ struct st_mariadb_rpl_table_map_event {
   MARIADB_STRING database;
   MARIADB_STRING table;
   unsigned int column_count;
-  char *column_types;
+  MARIADB_STRING column_types;
   MARIADB_STRING metadata;
   char *null_indicator;
 };

diff --git a/libmariadb/mariadb_rpl.c b/libmariadb/mariadb_rpl.c
@@ -246,8 +246,10 @@ MARIADB_RPL_EVENT * STDCALL mariadb_rpl_fetch(MARIADB_RPL *rpl, MARIADB_RPL_EVEN
         goto mem_error;
       ev+= len + 1;
       rpl_event->event.table_map.column_count= mysql_net_field_length(&ev);
-      rpl_event->event.table_map.column_types= (char *)ev;
-      ev+= rpl_event->event.table_map.column_count;
+      len= 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);
       if (rpl_alloc_string(rpl_event, &rpl_event->event.table_map.metadata, ev, len))
         goto mem_error;