MDEV-38126: Fix -DWITH_UBSAN=ON

dr-m · dr-m · commit 5676ecfbb371 · 2025-11-19T16:50:17.000+02:00
logger_init_mutexes(void): Define the function as taking no
arguments, to avoid function pointer type mismatch.

my_b_flush_io_cache(): runtime error: addition of unsigned offset ...
overflowed. Cast to a signed offset.
diff --git a/mysys/file_logger.c b/mysys/file_logger.c
@@ -311,7 +311,7 @@ int logger_set_rotations(LOGGER_HANDLE *log, unsigned int new_rotations)
   return 0;
 }
 
-void logger_init_mutexes()
+void logger_init_mutexes(void)
 {
 #ifdef HAVE_PSI_INTERFACE
   if (unlikely(PSI_server))
diff --git a/mysys/mf_iocache.c b/mysys/mf_iocache.c
@@ -1790,7 +1790,8 @@ int my_b_flush_io_cache(IO_CACHE *info, int need_append_buffer_lock)
 
     if ((length=(size_t) (info->write_pos - info->write_buffer)))
     {
-      my_off_t eof= info->end_of_file + info->write_pos - info->append_read_pos;
+      my_off_t eof= info->end_of_file +
+        (ptrdiff_t)(info->write_pos - info->append_read_pos);
       if (append_cache)
       {
         if (tmp_file_track(info, eof) ||

Original file line number	Diff line number	Diff line change
`@@ -311,7 +311,7 @@ int logger_set_rotations(LOGGER_HANDLE *log, unsigned int new_rotations)`
`311`	`311`	`return 0;`
`312`	`312`	`}`
`313`	`313`
`314`		`-void logger_init_mutexes()`
	`314`	`+void logger_init_mutexes(void)`
`315`	`315`	`{`
`316`	`316`	`#ifdef HAVE_PSI_INTERFACE`
`317`	`317`	`if (unlikely(PSI_server))`
Original file line number	Diff line number	Diff line change
`@@ -1790,7 +1790,8 @@ int my_b_flush_io_cache(IO_CACHE *info, int need_append_buffer_lock)`
`1790`	`1790`
`1791`	`1791`	`if ((length=(size_t) (info->write_pos - info->write_buffer)))`
`1792`	`1792`	`{`
`1793`		`- my_off_t eof= info->end_of_file + info->write_pos - info->append_read_pos;`
	`1793`	`+ my_off_t eof= info->end_of_file +`
	`1794`	`+ (ptrdiff_t)(info->write_pos - info->append_read_pos);`
`1794`	`1795`	`if (append_cache)`
`1795`	`1796`	`{`
`1796`	`1797`	`if (tmp_file_track(info, eof) \|\|`