Fix leak in SWAP WORLD command, add Valgrind suppressions

AliceLR · Jul 11, 2019 · 9b03653 · 9b03653
1 parent 5e97948
commit 9b03653
Show file tree

Hide file tree

Showing 2 changed files with 163 additions and 2 deletions.
diff --git a/src/run_robot.c b/src/run_robot.c
@@ -5467,13 +5467,13 @@ void run_robot(context *ctx, int id, int x, int y)
              ERROR_T_ERROR, ERROR_OPT_FAIL|ERROR_OPT_RETRY, 0x2C01);
           }
         } while(redo_load == ERROR_OPT_RETRY);
+        free(translated_name);
 
         // User asked to "Fail" on error message above
         if(redo_load == ERROR_OPT_FAIL)
           break;
 
         mzx_world->change_game_state = CHANGE_STATE_SWAP_WORLD;
-        free(translated_name);
         return;
       }
 

diff --git a/valgrind.supp b/valgrind.supp
@@ -93,4 +93,165 @@
    fun:SDL_Init
    fun:platform_init
    fun:main
-}
+}
+
+{
+   X11_InitKeyboard via SDL_VideoInit
+   Memcheck:Leak
+   fun:malloc
+   ...
+   fun:SDL_DBus_Init
+   fun:SDL_DBus_GetContext
+   fun:SDL_IBus_Init
+   fun:SDL_IME_Init
+}
+
+{
+   X11_InitKeyboard via SDL_VideoInit
+   Memcheck:Leak
+   fun:calloc
+   ...
+   fun:SDL_DBus_Init
+   fun:SDL_DBus_GetContext
+   fun:SDL_IBus_Init
+   fun:SDL_IME_Init
+}
+
+{
+   X11_InitKeyboard via SDL_VideoInit
+   Memcheck:Leak
+   fun:malloc
+   ...
+   fun:X11_InitKeyboard
+   fun:X11_VideoInit
+   fun:SDL_VideoInit_REAL
+}
+
+{
+   X11_InitKeyboard via SDL_VideoInit
+   Memcheck:Leak
+   fun:calloc
+   ...
+   fun:X11_InitKeyboard
+   fun:X11_VideoInit
+   fun:SDL_VideoInit_REAL
+}
+
+{
+   X11_InitKeyboard via SDL_VideoInit
+   Memcheck:Leak
+   fun:realloc
+   ...
+   fun:X11_InitKeyboard
+   fun:X11_VideoInit
+   fun:SDL_VideoInit_REAL
+}
+
+{
+   Alsa
+   Memcheck:Leak
+   fun:malloc
+   ...
+   fun:snd_config_hook_load
+}
+{
+   Alsa
+   Memcheck:Leak
+   fun:calloc
+   ...
+   fun:snd_config_hook_load
+}
+{
+   Alsa
+   Memcheck:Leak
+   fun:malloc
+   ...
+   fun:snd_config_update_r
+}
+{
+   Alsa
+   Memcheck:Leak
+   fun:calloc
+   ...
+   fun:snd_config_update_r
+}
+{
+   Alsa
+   Memcheck:Leak
+   fun:malloc
+   obj:*/libasound.so.2.0.0
+   obj:*/libasound.so.2.0.0
+   obj:*/libasound.so.2.0.0
+   obj:*/libasound.so.2.0.0
+   obj:*/libasound.so.2.0.0
+   obj:*/libasound.so.2.0.0
+   obj:*/libasound.so.2.0.0
+   obj:*/libasound.so.2.0.0
+   obj:*/libasound.so.2.0.0
+   obj:*/libasound.so.2.0.0
+   obj:*/libasound.so.2.0.0
+}
+{
+   Alsa
+   Memcheck:Leak
+   fun:calloc
+   obj:*/libasound.so.2.0.0
+   obj:*/libasound.so.2.0.0
+   obj:*/libasound.so.2.0.0
+   obj:*/libasound.so.2.0.0
+   obj:*/libasound.so.2.0.0
+   obj:*/libasound.so.2.0.0
+   obj:*/libasound.so.2.0.0
+   obj:*/libasound.so.2.0.0
+   obj:*/libasound.so.2.0.0
+   obj:*/libasound.so.2.0.0
+   obj:*/libasound.so.2.0.0
+}
+{
+   Alsa
+   Memcheck:Leak
+   fun:malloc
+   ...
+   fun:snd_config_load
+}
+{
+   Alsa
+   Memcheck:Leak
+   fun:malloc
+   ...
+   fun:parse_array_defs
+}
+{
+   Alsa
+   Memcheck:Leak
+   fun:malloc
+   ...
+   fun:snd1_dlobj_cache_get
+}
+{
+   Alsa
+   Memcheck:Leak
+   fun:malloc
+   fun:snd_pcm_hw_get_chmap
+   fun:snd_pcm_get_chmap
+   fun:snd1_pcm_direct_get_chmap
+   fun:snd_pcm_get_chmap
+   fun:snd1_pcm_generic_get_chmap
+   fun:snd_pcm_get_chmap
+   fun:snd1_pcm_generic_get_chmap
+   fun:snd_pcm_get_chmap
+   fun:snd1_pcm_generic_get_chmap
+   fun:snd_pcm_get_chmap
+   fun:snd_pcm_set_chmap
+}
+{
+   Alsa
+   Memcheck:Cond
+   fun:snd_interval_floor
+   fun:snd_pcm_plug_hw_refine_cchange
+   fun:snd1_pcm_hw_refine_slave
+   fun:snd_pcm_plug_hw_refine
+   fun:snd_pcm_hw_refine
+   fun:snd1_pcm_hw_param_set_last
+   ...
+}