database/mariadb
database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-06-03 07:02:23 +03:00
Code

Fixed crashing bug in mysqlbinlog

Browse Source 
- The fix in mf_iocache2.c was just to fix a compiler warning
This commit is contained in:
Monty 2018-01-03 01:05:25 +02:00
parent 14e01bd868
commit 16cd55a33a
2 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
mysys/mf_iocache2.c
View File

@ -266,11 +266,11 @@ my_b_write_backtick_quote(IO_CACHE *info, const char *str, size_t len)
++p; ++p;
count= p - start; count= p - start;
if (count && my_b_write(info, start, count)) if (count && my_b_write(info, start, count))
return (size_t)-1; return 1;
if (p >= end) if (p >= end)
break; break;
if (my_b_write(info, (uchar *)"``", 2)) if (my_b_write(info, (uchar *)"``", 2))
return (size_t)-1; return 1;
++p; ++p;
} }
return (my_b_write(info, (uchar *)"`", 1)); return (my_b_write(info, (uchar *)"`", 1));

11
sql/log_event.cc
View File

@ -3405,9 +3405,12 @@ static size_t calc_field_event_length(const uchar *ptr, uint type, uint meta)
return (meta <= 4 ? meta : 0); return (meta <= 4 ? meta : 0);
case MYSQL_TYPE_VARCHAR: case MYSQL_TYPE_VARCHAR:
case MYSQL_TYPE_VAR_STRING: case MYSQL_TYPE_VAR_STRING:
case MYSQL_TYPE_STRING:
length= meta; length= meta;
return length < 256 ? length + 1 : length + 2; /* Fall trough */
case MYSQL_TYPE_STRING:
if (length < 256)
return (uint) *ptr + 1;
return uint2korr(ptr) + 2;
case MYSQL_TYPE_DECIMAL: case MYSQL_TYPE_DECIMAL:
break; break;
default: default:
@ -3506,6 +3509,7 @@ void Rows_log_event::count_row_events(PRINT_EVENT_INFO *print_event_info)
&m_cols, value))) &m_cols, value)))
break; break;
value+= length; value+= length;
DBUG_ASSERT(value <= m_rows_end);
/* Print the second image (for UPDATE only) */ /* Print the second image (for UPDATE only) */
if (row_events == 2) if (row_events == 2)
@ -3514,6 +3518,7 @@ void Rows_log_event::count_row_events(PRINT_EVENT_INFO *print_event_info)
&m_cols_ai, value))) &m_cols_ai, value)))
break; break;
value+= length; value+= length;
DBUG_ASSERT(value <= m_rows_end);
} }
} }
delete td; delete td;
@ -3531,7 +3536,7 @@ bool Rows_log_event::print_verbose(IO_CACHE *file,
PRINT_EVENT_INFO *print_event_info) PRINT_EVENT_INFO *print_event_info)
{ {
Table_map_log_event *map; Table_map_log_event *map;
table_def *td; table_def *td= 0;
const char *sql_command, *sql_clause1, *sql_clause2; const char *sql_command, *sql_clause1, *sql_clause2;
const char *sql_command_short __attribute__((unused)); const char *sql_command_short __attribute__((unused));
Log_event_type general_type_code= get_general_type_code(); Log_event_type general_type_code= get_general_type_code();