Skip to content

M
MariaDB
Commit c5425944 authored by He Zhenxing's avatar He Zhenxing
Browse files
Options

Auto merge from 5.1-rep-semisync

parents 2fb387b0 e0042460
Hide whitespace changes
Inline Side-by-side
Showing with 2 additions and 1 deletion
plugin/semisync/semisync_master.cc
View file @ c5425944
...@@ -1128,12 +1128,13 @@ int ReplSemiSyncMaster::readSlaveReply(NET *net, uint32 server_id, ...@@ -1128,12 +1128,13 @@ int ReplSemiSyncMaster::readSlaveReply(NET *net, uint32 server_id,
log_file_pos = uint8korr(packet + REPLY_BINLOG_POS_OFFSET); log_file_pos = uint8korr(packet + REPLY_BINLOG_POS_OFFSET);
log_file_len = packet_len - REPLY_BINLOG_NAME_OFFSET; log_file_len = packet_len - REPLY_BINLOG_NAME_OFFSET;
if (log_file_len > FN_REFLEN) if (log_file_len >= FN_REFLEN)
{ {
sql_print_error("Read semi-sync reply binlog file length too large"); sql_print_error("Read semi-sync reply binlog file length too large");
goto l_end; goto l_end;
} }
strncpy(log_file_name, (const char*)packet + REPLY_BINLOG_NAME_OFFSET, log_file_len); strncpy(log_file_name, (const char*)packet + REPLY_BINLOG_NAME_OFFSET, log_file_len);
log_file_name[log_file_len] = 0;
if (trc_level & kTraceDetail) if (trc_level & kTraceDetail)
sql_print_information("%s: Got reply (%s, %lu)", sql_print_information("%s: Got reply (%s, %lu)",
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7