Fixed access to uninitalized memory found by valgrind

montywi · montywi · commit 3eadb135fd7b · 2020-05-15T15:20:42.000+03:00
diff --git a/sql/sql_repl.cc b/sql/sql_repl.cc
@@ -1958,7 +1958,7 @@ send_event_to_slave(binlog_send_info *info, Log_event_type event_type,
 
   pos= my_b_tell(log);
   if (repl_semisync_master.update_sync_header(info->thd,
-                                              (uchar*) packet->c_ptr(),
+                                              (uchar*) packet->c_ptr_safe(),
                                               info->log_file_name + info->dirlen,
                                               pos, &need_sync))
   {
@@ -1982,7 +1982,8 @@ send_event_to_slave(binlog_send_info *info, Log_event_type event_type,
     }
   }
 
-  if (need_sync && repl_semisync_master.flush_net(info->thd, packet->c_ptr()))
+  if (need_sync && repl_semisync_master.flush_net(info->thd,
+                                                  packet->c_ptr_safe()))
   {
     info->error= ER_UNKNOWN_ERROR;
     return "Failed to run hook 'after_send_event'";

Original file line number	Diff line number	Diff line change
`@@ -1958,7 +1958,7 @@ send_event_to_slave(binlog_send_info *info, Log_event_type event_type,`
`1958`	`1958`
`1959`	`1959`	`pos= my_b_tell(log);`
`1960`	`1960`	`if (repl_semisync_master.update_sync_header(info->thd,`
`1961`		`- (uchar*) packet->c_ptr(),`
	`1961`	`+ (uchar*) packet->c_ptr_safe(),`
`1962`	`1962`	`info->log_file_name + info->dirlen,`
`1963`	`1963`	`pos, &need_sync))`
`1964`	`1964`	`{`
`@@ -1982,7 +1982,8 @@ send_event_to_slave(binlog_send_info *info, Log_event_type event_type,`
`1982`	`1982`	`}`
`1983`	`1983`	`}`
`1984`	`1984`
`1985`		`- if (need_sync && repl_semisync_master.flush_net(info->thd, packet->c_ptr()))`
	`1985`	`+ if (need_sync && repl_semisync_master.flush_net(info->thd,`
	`1986`	`+ packet->c_ptr_safe()))`
`1986`	`1987`	`{`
`1987`	`1988`	`info->error= ER_UNKNOWN_ERROR;`
`1988`	`1989`	`return "Failed to run hook 'after_send_event'";`