MDEV-30435 MDEV-30981 Fix ubsan errors w.r.t. memcpy in spd_trx.cc

Extract the indexed string memcopy pattern in spd_trx.cc to a static
inline function.

Also updated the ubsan check in mdev_26541.test (h/t roel).

storage/spider/mysql-test/spider/bugfix/r/mdev_30981.result

+#
+# MDEV-30981 Spider UBSAN: null pointer passed as argument 2, which is declared to never be null in spider_create_trx_alter_table on ALTER
+#
+for master_1
+for child2
+for child3
+CREATE TABLE t (c INT) ENGINE=Spider PARTITION BY LIST (c) (PARTITION p VALUES IN (1,2));
+ALTER TABLE t ENGINE=InnoDB;
+drop table t;
+for master_1
+for child2
+for child3

storage/spider/mysql-test/spider/bugfix/t/mdev_26541.test

@@ -2,7 +2,7 @@
 --echo # MDEV-26541 Undefined symbol: _ZTI12ha_partition when attempting to use ha_spider.so in UBSAN builds
 --echo #
 
-if (`select not(count(*)) from information_schema.system_variables where variable_name='have_sanitizer' and global_value="UBSAN"`)
+if (`select not(count(*)) from information_schema.system_variables where variable_name='have_sanitizer' and global_value like "%UBSAN%"`)
 {
 --skip test needs to be run with UBSAN
 }

storage/spider/mysql-test/spider/bugfix/t/mdev_30981.test

+--echo #
+--echo # MDEV-30981 Spider UBSAN: null pointer passed as argument 2, which is declared to never be null in spider_create_trx_alter_table on ALTER
+--echo #
+
+if (`select not(count(*)) from information_schema.system_variables where variable_name='have_sanitizer' and global_value like "%UBSAN%"`)
+{
+--skip test needs to be run with UBSAN
+}
+ 
+--disable_query_log
+--disable_result_log
+--source ../../t/test_init.inc
+--enable_result_log
+--enable_query_log
+ 
+CREATE TABLE t (c INT) ENGINE=Spider PARTITION BY LIST (c) (PARTITION p VALUES IN (1,2));
+ALTER TABLE t ENGINE=InnoDB;
+drop table t;
+ 
+--disable_query_log
+--disable_result_log
+--source ../t/test_deinit.inc
+--enable_query_log
+--enable_result_log

storage/spider/spd_trx.cc

@@ -482,12 +482,28 @@ int spider_free_trx_alter_table(
   DBUG_RETURN(0);
 }
 
+/** Copy a string from one array to another */
+static inline void spider_maybe_memcpy_indexed_string(
+  char **dests,
+  char **srcs,
+  const uint* lengths,
+  const int idx,
+  char *&ptr)
+{
+  if (size_t len= sizeof(char) * lengths[idx])
+  {
+    dests[idx]= ptr;
+    memcpy(ptr, srcs[idx], len);
+    ptr+= len + 1;
+  }
+}
+
 int spider_create_trx_alter_table(
   SPIDER_TRX *trx,
   SPIDER_SHARE *share,
   bool now_create
 ) {
-  int error_num, roop_count;
+  int error_num, link_idx;
   SPIDER_ALTER_TABLE *alter_table, *share_alter;
   char *tmp_name;
   char **tmp_server_names;
@@ -682,145 +698,74 @@ int spider_create_trx_alter_table(
   alter_table->tmp_tgt_default_groups_lengths = tmp_tgt_default_groups_lengths;
   alter_table->tmp_static_link_ids_lengths = tmp_static_link_ids_lengths;
 
-  size_t len;
-  for(roop_count = 0; roop_count < (int) share->all_link_count; roop_count++)
+  for(link_idx = 0; link_idx < (int) share->all_link_count; link_idx++)
   {
-    if ((len=
-             sizeof(char) * share_alter->tmp_server_names_lengths[roop_count]))
-    {
-      tmp_server_names[roop_count]= tmp_server_names_char;
-      memcpy(tmp_server_names_char, share_alter->tmp_server_names[roop_count],
-             len);
-      tmp_server_names_char+= len + 1;
-    }
-
-    if ((len= sizeof(char) *
-              share_alter->tmp_tgt_table_names_lengths[roop_count]))
-    {
-      tmp_tgt_table_names[roop_count]= tmp_tgt_table_names_char;
-      memcpy(tmp_tgt_table_names_char,
-             share_alter->tmp_tgt_table_names[roop_count], len);
-      tmp_tgt_table_names_char+= len + 1;
-    }
-
-    if ((len= sizeof(char) * share_alter->tmp_tgt_dbs_lengths[roop_count]))
-    {
-      tmp_tgt_dbs[roop_count]= tmp_tgt_dbs_char;
-      memcpy(tmp_tgt_dbs_char, share_alter->tmp_tgt_dbs[roop_count], len);
-      tmp_tgt_dbs_char+= len + 1;
-    }
-
-    if ((len= sizeof(char) * share_alter->tmp_tgt_hosts_lengths[roop_count]))
-    {
-      tmp_tgt_hosts[roop_count]= tmp_tgt_hosts_char;
-      memcpy(tmp_tgt_hosts_char, share_alter->tmp_tgt_hosts[roop_count], len);
-      tmp_tgt_hosts_char+= len + 1;
-    }
-
-    if ((len= sizeof(char) *
-              share_alter->tmp_tgt_usernames_lengths[roop_count]))
-    {
-      tmp_tgt_usernames[roop_count]= tmp_tgt_usernames_char;
-      memcpy(tmp_tgt_usernames_char,
-             share_alter->tmp_tgt_usernames[roop_count], len);
-      tmp_tgt_usernames_char+= len + 1;
-    }
-
-    if ((len= sizeof(char) *
-              share_alter->tmp_tgt_passwords_lengths[roop_count]))
-    {
-      tmp_tgt_passwords[roop_count]= tmp_tgt_passwords_char;
-      memcpy(tmp_tgt_passwords_char,
-             share_alter->tmp_tgt_passwords[roop_count], len);
-      tmp_tgt_passwords_char+= len + 1;
-    }
-
-    if ((len= sizeof(char) * share_alter->tmp_tgt_sockets_lengths[roop_count]))
-    {
-      tmp_tgt_sockets[roop_count]= tmp_tgt_sockets_char;
-      memcpy(tmp_tgt_sockets_char, share_alter->tmp_tgt_sockets[roop_count],
-             len);
-      tmp_tgt_sockets_char+= len + 1;
-    }
-
-    if ((len=
-             sizeof(char) * share_alter->tmp_tgt_wrappers_lengths[roop_count]))
-    {
-      tmp_tgt_wrappers[roop_count]= tmp_tgt_wrappers_char;
-      memcpy(tmp_tgt_wrappers_char, share_alter->tmp_tgt_wrappers[roop_count],
-             len);
-      tmp_tgt_wrappers_char+= len + 1;
-    }
-
-    if ((len= sizeof(char) * share_alter->tmp_tgt_ssl_cas_lengths[roop_count]))
-    {
-      tmp_tgt_ssl_cas[roop_count]= tmp_tgt_ssl_cas_char;
-      memcpy(tmp_tgt_ssl_cas_char, share_alter->tmp_tgt_ssl_cas[roop_count],
-             len);
-      tmp_tgt_ssl_cas_char+= len + 1;
-    }
-
-    if ((len= sizeof(char) *
-              share_alter->tmp_tgt_ssl_capaths_lengths[roop_count]))
-    {
-      tmp_tgt_ssl_capaths[roop_count]= tmp_tgt_ssl_capaths_char;
-      memcpy(tmp_tgt_ssl_capaths_char,
-             share_alter->tmp_tgt_ssl_capaths[roop_count], len);
-      tmp_tgt_ssl_capaths_char+= len + 1;
-    }
-
-    if ((len= sizeof(char) *
-              share_alter->tmp_tgt_ssl_certs_lengths[roop_count]))
-    {
-      tmp_tgt_ssl_certs[roop_count]= tmp_tgt_ssl_certs_char;
-      memcpy(tmp_tgt_ssl_certs_char,
-             share_alter->tmp_tgt_ssl_certs[roop_count], len);
-      tmp_tgt_ssl_certs_char+= len + 1;
-    }
-
-    if ((len= sizeof(char) *
-              share_alter->tmp_tgt_ssl_ciphers_lengths[roop_count]))
-    {
-      tmp_tgt_ssl_ciphers[roop_count]= tmp_tgt_ssl_ciphers_char;
-      memcpy(tmp_tgt_ssl_ciphers_char,
-             share_alter->tmp_tgt_ssl_ciphers[roop_count], len);
-      tmp_tgt_ssl_ciphers_char+= len + 1;
-    }
-
-    if ((len= sizeof(char) * share_alter->tmp_tgt_ssl_keys_lengths[roop_count]))
-    {
-      tmp_tgt_ssl_keys[roop_count]= tmp_tgt_ssl_keys_char;
-      memcpy(tmp_tgt_ssl_keys_char, share_alter->tmp_tgt_ssl_keys[roop_count],
-             len);
-      tmp_tgt_ssl_keys_char+= len + 1;
-    }
-
-    if ((len= sizeof(char) *
-              share_alter->tmp_tgt_default_files_lengths[roop_count]))
-    {
-      tmp_tgt_default_files[roop_count]= tmp_tgt_default_files_char;
-      memcpy(tmp_tgt_default_files_char,
-             share_alter->tmp_tgt_default_files[roop_count], len);
-      tmp_tgt_default_files_char+= len + 1;
-    }
-
-    if ((len= sizeof(char) *
-              share_alter->tmp_tgt_default_groups_lengths[roop_count]))
-    {
-      tmp_tgt_default_groups[roop_count]= tmp_tgt_default_groups_char;
-      memcpy(tmp_tgt_default_groups_char,
-             share_alter->tmp_tgt_default_groups[roop_count], len);
-      tmp_tgt_default_groups_char+= len + 1;
-    }
-
-    if ((len= sizeof(char) *
-              share_alter->tmp_static_link_ids_lengths[roop_count]))
-    {
-      tmp_static_link_ids[roop_count] = tmp_static_link_ids_char;
-      memcpy(tmp_static_link_ids_char,
-             share_alter->tmp_static_link_ids[roop_count], len);
-      tmp_static_link_ids_char += len + 1;
-    }
+    spider_maybe_memcpy_indexed_string(
+      tmp_server_names, share_alter->tmp_server_names,
+      share_alter->tmp_server_names_lengths, link_idx, tmp_server_names_char);
+
+    spider_maybe_memcpy_indexed_string(
+      tmp_tgt_table_names, share_alter->tmp_tgt_table_names,
+      share_alter->tmp_tgt_table_names_lengths, link_idx, tmp_tgt_table_names_char);
+
+    spider_maybe_memcpy_indexed_string(
+      tmp_tgt_dbs, share_alter->tmp_tgt_dbs,
+      share_alter->tmp_tgt_dbs_lengths, link_idx, tmp_tgt_dbs_char);
+
+    spider_maybe_memcpy_indexed_string(
+      tmp_tgt_hosts, share_alter->tmp_tgt_hosts,
+      share_alter->tmp_tgt_hosts_lengths, link_idx, tmp_tgt_hosts_char);
+
+    spider_maybe_memcpy_indexed_string(
+      tmp_tgt_usernames, share_alter->tmp_tgt_usernames,
+      share_alter->tmp_tgt_usernames_lengths, link_idx, tmp_tgt_usernames_char);
+
+    spider_maybe_memcpy_indexed_string(
+      tmp_tgt_passwords, share_alter->tmp_tgt_passwords,
+      share_alter->tmp_tgt_passwords_lengths, link_idx, tmp_tgt_passwords_char);
+
+    spider_maybe_memcpy_indexed_string(
+      tmp_tgt_sockets, share_alter->tmp_tgt_sockets,
+      share_alter->tmp_tgt_sockets_lengths, link_idx, tmp_tgt_sockets_char);
+
+    spider_maybe_memcpy_indexed_string(
+      tmp_tgt_wrappers, share_alter->tmp_tgt_wrappers,
+      share_alter->tmp_tgt_wrappers_lengths, link_idx, tmp_tgt_wrappers_char);
+
+    spider_maybe_memcpy_indexed_string(
+      tmp_tgt_ssl_cas, share_alter->tmp_tgt_ssl_cas,
+      share_alter->tmp_tgt_ssl_cas_lengths, link_idx, tmp_tgt_ssl_cas_char);
+
+    spider_maybe_memcpy_indexed_string(
+      tmp_tgt_ssl_capaths, share_alter->tmp_tgt_ssl_capaths,
+      share_alter->tmp_tgt_ssl_capaths_lengths, link_idx, tmp_tgt_ssl_capaths_char);
+
+    spider_maybe_memcpy_indexed_string(
+      tmp_tgt_ssl_certs, share_alter->tmp_tgt_ssl_certs,
+      share_alter->tmp_tgt_ssl_certs_lengths, link_idx, tmp_tgt_ssl_certs_char);
+
+    spider_maybe_memcpy_indexed_string(
+      tmp_tgt_ssl_ciphers, share_alter->tmp_tgt_ssl_ciphers,
+      share_alter->tmp_tgt_ssl_ciphers_lengths, link_idx, tmp_tgt_ssl_ciphers_char);
+
+    spider_maybe_memcpy_indexed_string(
+      tmp_tgt_ssl_keys, share_alter->tmp_tgt_ssl_keys,
+      share_alter->tmp_tgt_ssl_keys_lengths, link_idx, tmp_tgt_ssl_keys_char);
+
+    spider_maybe_memcpy_indexed_string(
+      tmp_tgt_default_files, share_alter->tmp_tgt_default_files,
+      share_alter->tmp_tgt_default_files_lengths, link_idx, tmp_tgt_default_files_char);
+
+    spider_maybe_memcpy_indexed_string(
+      tmp_tgt_default_groups, share_alter->tmp_tgt_default_groups,
+      share_alter->tmp_tgt_default_groups_lengths, link_idx, tmp_tgt_default_groups_char);
+
+    /* Notes on merge conflicts (remove this comment after merging):
+    for 10.5 see 3b2d1d135155fe3adf1bc28f8b0be1ecc2ea4f40
+    for 10.6+ see d74103292c7be236f3da71c86249d37295f57bbc */
+    spider_maybe_memcpy_indexed_string(
+      tmp_static_link_ids, share_alter->tmp_static_link_ids,
+      share_alter->tmp_static_link_ids_lengths, link_idx, tmp_static_link_ids_char);
   }
 
   memcpy(tmp_tgt_ports, share_alter->tmp_tgt_ports,