Fix use-after-free on shutdown in options/audio

Closes #2132.
longturn · Jan 4, 2024 · 23bf528 · 23bf528
1 parent 3a3b1d7
commit 23bf528
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 0 deletions.
diff --git a/client/audio/audio.cpp b/client/audio/audio.cpp
@@ -609,6 +609,11 @@ void audio_set_volume(double volume)
  */
 void audio_shutdown()
 {
+  // Already shut down
+  if (selected_plugin < 0) {
+    return;
+  }
+
   // avoid infinite loop at end of game
   audio_stop();
 
@@ -624,6 +629,9 @@ void audio_shutdown()
     secfile_destroy(ms_tagfile);
     ms_tagfile = nullptr;
   }
+
+  // Mark shutdown
+  selected_plugin = -1;
 }
 
 /**

diff --git a/client/client_main.cpp b/client/client_main.cpp
@@ -658,6 +658,8 @@ void client_exit()
     options_save(log_option_save_msg);
   }
 
+  audio_shutdown();
+
   overview_free();
   tileset_free(tileset);