MDEV-30936 fixup

fil_space_t::~fil_space_t(): Invoke ut_free(name) because doing so in the callers would trip MSAN_OPTIONS=poison_in_dtor=1
MariaDB · Mar 28, 2023 · 402f36d · 402f36d
1 parent dfa9025
commit 402f36d
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 2 deletions.
diff --git a/storage/innobase/fil/fil0fil.cc b/storage/innobase/fil/fil0fil.cc
@@ -873,7 +873,6 @@ fil_space_free_low(
 	fil_space_destroy_crypt_data(&space->crypt_data);
 
 	space->~fil_space_t();
-	ut_free(space->name);
 	ut_free(space);
 }
 
@@ -998,7 +997,6 @@ fil_space_t *fil_space_t::create(const char *name, ulint id, ulint flags,
 		mutex_exit(&fil_system.mutex);
 		rw_lock_free(&space->latch);
 		space->~fil_space_t();
-		ut_free(space->name);
 		ut_free(space);
 		return(NULL);
 	}

diff --git a/storage/innobase/include/fil0fil.h b/storage/innobase/include/fil0fil.h
@@ -339,6 +339,7 @@ struct fil_space_t final
 #endif
 {
 #ifndef UNIV_INNOCHECKSUM
+  ~fil_space_t() { ut_free(name); }
   friend fil_node_t;
 	ulint		id;	/*!< space id */
 	hash_node_t	hash;	/*!< hash chain node */