Merge pull request #36 from Willy-JL/fix-double-free-crash

kbembedded · web-flow · commit b9fd9dc3bf87 · 2024-05-18T04:17:38.000-07:00
Fix double free crash at app exit on TLSF
diff --git a/views/select_pokemon.c b/views/select_pokemon.c
@@ -137,6 +137,5 @@ View* select_pokemon_alloc(PokemonFap* pokemon_fap) {
 
 void select_pokemon_free(PokemonFap* pokemon_fap) {
     furi_assert(pokemon_fap);
-    view_free_model(pokemon_fap->select_view);
     view_free(pokemon_fap->select_view);
 }
diff --git a/views/trade.c b/views/trade.c
@@ -762,7 +762,6 @@ void trade_free(ViewDispatcher* view_dispatcher, uint32_t view_id, void* trade_c
 
     view_dispatcher_remove_view(view_dispatcher, view_id);
 
-    view_free_model(trade->view);
     view_free(trade->view);
     free(trade->input_block);
     free(trade);

Original file line number	Diff line number	Diff line change
`@@ -137,6 +137,5 @@ View* select_pokemon_alloc(PokemonFap* pokemon_fap) {`
`137`	`137`
`138`	`138`	`void select_pokemon_free(PokemonFap* pokemon_fap) {`
`139`	`139`	`furi_assert(pokemon_fap);`
`140`		`- view_free_model(pokemon_fap->select_view);`
`141`	`140`	`view_free(pokemon_fap->select_view);`
`142`	`141`	`}`