ShuriZma
/
RetroArch
mirror of https://github.com/libretro/RetroArch.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix some memory leaks and fallthrough errors picked up on by 

Clang static code analyzer
This commit is contained in:
twinaphex 2020-06-07 16:15:35 +02:00
parent df8df6c18b
commit 98b847cad9
4 changed files with 71 additions and 50 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

104
menu/drivers/materialui.c
View File

@ -7095,16 +7095,24 @@ static void *materialui_init(void **userdata, bool video_is_threaded)
unsigned width, height; unsigned width, height;
settings_t *settings = config_get_ptr(); settings_t *settings = config_get_ptr();
materialui_handle_t *mui = NULL; materialui_handle_t *mui = NULL;
menu_handle_t *menu = (menu_handle_t*)calloc(1, sizeof(*menu));
static const char* const ticker_spacer = MUI_TICKER_SPACER; static const char* const ticker_spacer = MUI_TICKER_SPACER;
menu_handle_t *menu = (menu_handle_t*)
calloc(1, sizeof(*menu));
if (!menu || !settings) if (!menu)
return NULL; return NULL;
if (!settings)
{
free(menu);
return NULL;
}
if (!gfx_display_init_first_driver(video_is_threaded)) if (!gfx_display_init_first_driver(video_is_threaded))
goto error; goto error;
mui = (materialui_handle_t*)calloc(1, sizeof(materialui_handle_t)); mui = (materialui_handle_t*)
calloc(1, sizeof(materialui_handle_t));
if (!mui) if (!mui)
goto error; goto error;
@ -7112,7 +7120,7 @@ static void *materialui_init(void **userdata, bool video_is_threaded)
*userdata = mui; *userdata = mui;
/* Initialise thumbnail path data */ /* Initialise thumbnail path data */
mui->thumbnail_path_data = gfx_thumbnail_path_init(); mui->thumbnail_path_data = gfx_thumbnail_path_init();
if (!mui->thumbnail_path_data) if (!mui->thumbnail_path_data)
goto error; goto error;
@ -7120,54 +7128,56 @@ static void *materialui_init(void **userdata, bool video_is_threaded)
* UI elements */ * UI elements */
video_driver_get_size(&width, &height); video_driver_get_size(&width, &height);
mui->last_width = width; mui->last_width = width;
mui->last_height = height; mui->last_height = height;
mui->last_scale_factor = gfx_display_get_dpi_scale(width, height); mui->last_scale_factor = gfx_display_get_dpi_scale(
mui->dip_base_unit_size = mui->last_scale_factor width, height);
mui->dip_base_unit_size = mui->last_scale_factor
* MUI_DIP_BASE_UNIT_SIZE; * MUI_DIP_BASE_UNIT_SIZE;
mui->last_show_nav_bar = settings->bools.menu_materialui_show_nav_bar; mui->last_show_nav_bar = settings->bools.menu_materialui_show_nav_bar;
mui->last_auto_rotate_nav_bar = settings->bools.menu_materialui_auto_rotate_nav_bar; mui->last_auto_rotate_nav_bar = settings->bools.menu_materialui_auto_rotate_nav_bar;
mui->need_compute = false; mui->need_compute = false;
mui->is_playlist_tab = false; mui->is_playlist_tab = false;
mui->is_playlist = false; mui->is_playlist = false;
mui->is_file_list = false; mui->is_file_list = false;
mui->is_dropdown_list = false; mui->is_dropdown_list = false;
mui->is_core_updater_list = false; mui->is_core_updater_list = false;
mui->menu_stack_flushed = false; mui->menu_stack_flushed = false;
mui->first_onscreen_entry = 0; mui->first_onscreen_entry = 0;
mui->last_onscreen_entry = 0; mui->last_onscreen_entry = 0;
mui->menu_title[0] = '\0'; mui->menu_title[0] = '\0';
/* Set initial theme colours */ /* Set initial theme colours */
mui->color_theme = (enum materialui_color_theme)settings->uints.menu_materialui_color_theme; mui->color_theme = (enum materialui_color_theme)
settings->uints.menu_materialui_color_theme;
materialui_prepare_colors(mui, (enum materialui_color_theme)mui->color_theme); materialui_prepare_colors(mui, (enum materialui_color_theme)mui->color_theme);
/* Initial ticker configuration */ /* Initial ticker configuration */
mui->use_smooth_ticker = settings->bools.menu_ticker_smooth; mui->use_smooth_ticker = settings->bools.menu_ticker_smooth;
mui->ticker_smooth.font_scale = 1.0f; mui->ticker_smooth.font_scale = 1.0f;
mui->ticker_smooth.spacer = ticker_spacer; mui->ticker_smooth.spacer = ticker_spacer;
mui->ticker_smooth.x_offset = &mui->ticker_x_offset; mui->ticker_smooth.x_offset = &mui->ticker_x_offset;
mui->ticker_smooth.dst_str_width = &mui->ticker_str_width; mui->ticker_smooth.dst_str_width = &mui->ticker_str_width;
mui->ticker.spacer = ticker_spacer; mui->ticker.spacer = ticker_spacer;
/* Ensure menu animation parameters are properly /* Ensure menu animation parameters are properly
* reset */ * reset */
mui->touch_feedback_selection = 0; mui->touch_feedback_selection = 0;
mui->touch_feedback_alpha = 0.0f; mui->touch_feedback_alpha = 0.0f;
mui->touch_feedback_update_selection = false; mui->touch_feedback_update_selection = false;
mui->transition_alpha = 1.0f; mui->transition_alpha = 1.0f;
mui->transition_x_offset = 0.0f; mui->transition_x_offset = 0.0f;
mui->last_stack_size = 1; mui->last_stack_size = 1;
mui->scroll_animation_active = false; mui->scroll_animation_active = false;
mui->scroll_animation_selection = 0; mui->scroll_animation_selection = 0;
/* Ensure message box string is empty */ /* Ensure message box string is empty */
mui->msgbox[0] = '\0'; mui->msgbox[0] = '\0';
/* Initialise navigation bar */ /* Initialise navigation bar */
materialui_init_nav_bar(mui); materialui_init_nav_bar(mui);
@ -7183,10 +7193,10 @@ static void *materialui_init(void **userdata, bool video_is_threaded)
gfx_thumbnail_set_fade_missing(true); gfx_thumbnail_set_fade_missing(true);
/* Ensure that fullscreen thumbnails are inactive */ /* Ensure that fullscreen thumbnails are inactive */
mui->show_fullscreen_thumbnails = false; mui->show_fullscreen_thumbnails = false;
mui->fullscreen_thumbnail_selection = 0; mui->fullscreen_thumbnail_selection = 0;
mui->fullscreen_thumbnail_alpha = 0.0f; mui->fullscreen_thumbnail_alpha = 0.0f;
mui->fullscreen_thumbnail_label[0] = '\0'; mui->fullscreen_thumbnail_label[0] = '\0';
/* Ensure status bar has sane initial values */ /* Ensure status bar has sane initial values */
mui->status_bar.enabled = false; mui->status_bar.enabled = false;
@ -7330,13 +7340,13 @@ static void materialui_animate_scroll(
mui->scroll_animation_selection = menu_navigation_get_selection(); mui->scroll_animation_selection = menu_navigation_get_selection();
/* Configure animation */ /* Configure animation */
animation_entry.easing_enum = EASING_IN_OUT_QUAD; animation_entry.easing_enum = EASING_IN_OUT_QUAD;
animation_entry.tag = animation_tag; animation_entry.tag = animation_tag;
animation_entry.duration = duration; animation_entry.duration = duration;
animation_entry.target_value = scroll_pos; animation_entry.target_value = scroll_pos;
animation_entry.subject = &mui->scroll_y; animation_entry.subject = &mui->scroll_y;
animation_entry.cb = materialui_scroll_animation_end; animation_entry.cb = materialui_scroll_animation_end;
animation_entry.userdata = mui; animation_entry.userdata = mui;
/* Push animation */ /* Push animation */
gfx_animation_push(&animation_entry); gfx_animation_push(&animation_entry);

7
menu/drivers/rgui.c
View File

@ -1705,7 +1705,8 @@ static bool request_thumbnail(
return false; return false;
} }
static bool downscale_thumbnail(rgui_t *rgui, unsigned max_width, unsigned max_height, static bool downscale_thumbnail(rgui_t *rgui,
unsigned max_width, unsigned max_height,
struct texture_image *image_src, struct texture_image *image_dst) struct texture_image *image_src, struct texture_image *image_dst)
{ {
/* Determine output dimensions */ /* Determine output dimensions */
@ -1827,7 +1828,11 @@ static void process_thumbnail(rgui_t *rgui, thumbnail_t *thumbnail, uint32_t *qu
if ((image_src->width > thumbnail->max_width) || (image_src->height > thumbnail->max_height)) if ((image_src->width > thumbnail->max_width) || (image_src->height > thumbnail->max_height))
{ {
if (!downscale_thumbnail(rgui, thumbnail->max_width, thumbnail->max_height, image_src, &image_resampled)) if (!downscale_thumbnail(rgui, thumbnail->max_width, thumbnail->max_height, image_src, &image_resampled))
{
if (image_resampled.pixels)
free(image_resampled.pixels);
return; return;
}
image = &image_resampled; image = &image_resampled;
} }
else else

4
msg_hash.c
View File

@ -183,14 +183,16 @@ const char *get_user_language_iso639_1(bool limit)
break; break;
case RETRO_LANGUAGE_RUSSIAN: case RETRO_LANGUAGE_RUSSIAN:
voice = "ru"; voice = "ru";
break;
case RETRO_LANGUAGE_PERSIAN: case RETRO_LANGUAGE_PERSIAN:
voice = "fa"; voice = "fa";
break;
case RETRO_LANGUAGE_HEBREW: case RETRO_LANGUAGE_HEBREW:
voice = "he"; voice = "he";
break;
case RETRO_LANGUAGE_ASTURIAN: case RETRO_LANGUAGE_ASTURIAN:
voice = "ast"; voice = "ast";
break; break;
} }
return voice; return voice;
} }

6
tasks/task_screenshot.c
View File

@ -273,7 +273,8 @@ static bool screenshot_dump(
struct retro_system_info system_info; struct retro_system_info system_info;
uint8_t *buf = NULL; uint8_t *buf = NULL;
settings_t *settings = config_get_ptr(); settings_t *settings = config_get_ptr();
screenshot_task_state_t *state = (screenshot_task_state_t*)calloc(1, sizeof(*state)); screenshot_task_state_t *state = (screenshot_task_state_t*)
calloc(1, sizeof(*state));
state->shotname[0] = '\0'; state->shotname[0] = '\0';
@ -319,7 +320,10 @@ static bool screenshot_dump(
if (path_is_empty(RARCH_PATH_CONTENT)) if (path_is_empty(RARCH_PATH_CONTENT))
{ {
if (!core_get_system_info(&system_info)) if (!core_get_system_info(&system_info))
{
free(state);
return false; return false;
}
if (string_is_empty(system_info.library_name)) if (string_is_empty(system_info.library_name))
screenshot_name = "RetroArch"; screenshot_name = "RetroArch";