MDEV-21223 innodb_fts.sync_ddl fails in buildbot, server crashed in que_thr_step

FreeState(): replace pointer to freed memory with NULL. This actually fixes a crash
which is use-after-free as reported by ASAN

DbugParse(): unconditionally lock mutex because we're touching shared init_settings.keywords

1 files changed, 5 insertions, 2 deletions

diff --git a/dbug/dbug.c b/dbug/dbug.c
index cde6363c86a..e7bf69a14e5 100644
--- a/dbug/dbug.c
+++ b/dbug/dbug.c
@@ -511,9 +511,9 @@ static int DbugParse(CODE_STATE *cs, const char *control)
     {
       /* never share with the global parent - it can change under your feet */
       stack->functions= ListCopy(init_settings.functions);
-      LockIfInitSettings(cs);
+      LockMutex(cs);
       stack->keywords= ListCopy(init_settings.keywords);
-      UnlockIfInitSettings(cs);
+      UnlockMutex(cs);
       stack->processes= ListCopy(init_settings.processes);
     }
     else
@@ -1617,7 +1617,10 @@ static void FreeState(CODE_STATE *cs, int free_state)
   struct settings *state= cs->stack;
   LockIfInitSettings(cs);
   if (!is_shared(state, keywords))
+  {
     FreeList(state->keywords);
+    state->keywords= NULL;
+  }
   UnlockIfInitSettings(cs);
   if (!is_shared(state, functions))
     FreeList(state->functions);