MDEV-35735: UBSAN: spider udf functions mismatch with UDF defination

The mismatch occurs on the function calls as in the sql/sql_udf.h the types of "error" and "is_null" are unsigned char rather than char. This is corrected for the udf functions: * spider_direct_sql * spider_direct_bg_sql * spider_flush_table_mon_cache * spider_copy_tables * spider_ping_table Reviewer: Yuchen Pei
MariaDB · Jan 12, 2025 · 645e2a0 · 645e2a0
1 parent f077bb4
commit 645e2a0
Show file tree

Hide file tree

Showing 5 changed files with 26 additions and 26 deletions.
diff --git a/storage/spider/spd_copy_tables.cc b/storage/spider/spd_copy_tables.cc
@@ -714,8 +714,8 @@ int spider_udf_bg_copy_exec_sql(
 long long spider_copy_tables_body(
   UDF_INIT *initid,
   UDF_ARGS *args,
-  char *is_null,
-  char *error
+  unsigned char *is_null,
+  unsigned char *error
 ) {
   int error_num, roop_count, all_link_cnt = 0, use_table_charset;
   SPIDER_COPY_TABLES *copy_tables = NULL;

diff --git a/storage/spider/spd_direct_sql.cc b/storage/spider/spd_direct_sql.cc
@@ -1225,8 +1225,8 @@ void spider_udf_free_direct_sql_alloc(
 long long spider_direct_sql_body(
   UDF_INIT *initid,
   UDF_ARGS *args,
-  char *is_null,
-  char *error,
+  unsigned char *is_null,
+  unsigned char *error,
   my_bool bg
 ) {
   int error_num, roop_count;

diff --git a/storage/spider/spd_ping_table.cc b/storage/spider/spd_ping_table.cc
@@ -1071,8 +1071,8 @@ int spider_ping_table_cache_compare(
 long long spider_ping_table_body(
   UDF_INIT *initid,
   UDF_ARGS *args,
-  char *is_null,
-  char *error
+  unsigned char *is_null,
+  unsigned char *error
 ) {
   int error_num = 0, link_idx, flags, full_mon_count, current_mon_count,
     success_count, fault_count, tmp_error_num = 0;

diff --git a/storage/spider/spd_udf.cc b/storage/spider/spd_udf.cc
@@ -22,8 +22,8 @@ extern "C" {
 long long spider_direct_sql(
   UDF_INIT *initid,
   UDF_ARGS *args,
-  char *is_null,
-  char *error
+  unsigned char *is_null,
+  unsigned char *error
 ) {
   return spider_direct_sql_body(initid, args, is_null, error, FALSE);
 }
@@ -46,8 +46,8 @@ void spider_direct_sql_deinit(
 long long spider_bg_direct_sql(
   UDF_INIT *initid,
   UDF_ARGS *args,
-  char *is_null,
-  char *error
+  unsigned char *is_null,
+  unsigned char *error
 ) {
   return spider_direct_sql_bg_end(initid);
 }
@@ -68,17 +68,17 @@ void spider_bg_direct_sql_deinit(
 
 void spider_bg_direct_sql_clear(
   UDF_INIT *initid,
-  char *is_null,
-  char *error
+  unsigned char *is_null,
+  unsigned char *error
 ) {
   spider_direct_sql_bg_start(initid);
 }
 
 void spider_bg_direct_sql_add(
   UDF_INIT *initid,
   UDF_ARGS *args,
-  char *is_null,
-  char *error
+  unsigned char *is_null,
+  unsigned char *error
 ) {
   spider_direct_sql_body(initid, args, is_null, error, TRUE);
 }
@@ -87,8 +87,8 @@ void spider_bg_direct_sql_add(
 long long spider_ping_table(
   UDF_INIT *initid,
   UDF_ARGS *args,
-  char *is_null,
-  char *error
+  unsigned char *is_null,
+  unsigned char *error
 ) {
   return spider_ping_table_body(initid, args, is_null, error);
 }
@@ -110,8 +110,8 @@ void spider_ping_table_deinit(
 long long spider_flush_table_mon_cache(
   UDF_INIT *initid,
   UDF_ARGS *args,
-  char *is_null,
-  char *error
+  unsigned char *is_null,
+  unsigned char *error
 ) {
   return spider_flush_table_mon_cache_body();
 }
@@ -132,8 +132,8 @@ void spider_flush_table_mon_cache_deinit(
 long long spider_copy_tables(
   UDF_INIT *initid,
   UDF_ARGS *args,
-  char *is_null,
-  char *error
+  unsigned char *is_null,
+  unsigned char *error
 ) {
   return spider_copy_tables_body(initid, args, is_null, error);
 }

diff --git a/storage/spider/spd_udf.h b/storage/spider/spd_udf.h
@@ -16,8 +16,8 @@
 long long spider_direct_sql_body(
   UDF_INIT *initid,
   UDF_ARGS *args,
-  char *is_null,
-  char *error,
+  unsigned char *is_null,
+  unsigned char *error,
   my_bool bg
 );
 
@@ -45,8 +45,8 @@ long long spider_direct_sql_bg_end(
 long long spider_ping_table_body(
   UDF_INIT *initid,
   UDF_ARGS *args,
-  char *is_null,
-  char *error
+  unsigned char *is_null,
+  unsigned char *error
 );
 
 my_bool spider_ping_table_init_body(
@@ -64,8 +64,8 @@ long long spider_flush_table_mon_cache_body();
 long long spider_copy_tables_body(
   UDF_INIT *initid,
   UDF_ARGS *args,
-  char *is_null,
-  char *error
+  unsigned char *is_null,
+  unsigned char *error
 );
 
 my_bool spider_copy_tables_init_body(