libretro/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch.git synced 2024-11-24 08:30:16 +00:00
Code Issues Actions 23 Packages Projects Releases Wiki Activity

Try to prevent string message leaking in tasks

Browse Source
This commit is contained in:
twinaphex 2017-05-16 04:50:20 +02:00
parent 61a4e94649
commit 1bf0175da4
2 changed files with 13 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
tasks/task_autodetect.c
View File

@ -168,7 +168,10 @@ static void input_autoconfigure_joypad_add(config_file_t *conf,
string_is_empty(display_name) ? params->name : display_name);
if(!remote_is_bound)
{
task_free_title(task);
task_set_title(task, strdup(msg));
}
remote_is_bound = true;
if (params->idx == 0)
input_autoconfigure_swap_override = true;
@ -189,8 +192,11 @@ static void input_autoconfigure_joypad_add(config_file_t *conf,
}
if (!block_osd_spam)
{
task_free_title(task);
task_set_title(task, strdup(msg));
}
}
input_autoconfigure_joypad_reindex_devices(params);
@ -335,6 +341,7 @@ static void input_autoconfigure_connect_handler(retro_task_t *task)
params->name, (long)params->vid, (long)params->pid,
msg_hash_to_str(MSG_DEVICE_NOT_CONFIGURED));
#endif
task_free_title(task);
task_set_title(task, strdup(msg));
}

6
tasks/task_netplay_find_content.c
View File

@ -102,12 +102,14 @@ static void task_netplay_crc_scan_handler(retro_task_t *task)
netplay_crc_handle_t *state = (netplay_crc_handle_t*)task->state;
task_set_progress(task, 0);
task_free_title(task);
task_set_title(task, strdup("Looking for compatible content..."));
task_set_finished(task, false);
if (!state->lpl_list)
{
task_set_progress(task, 100);
task_free_title(task);
task_set_title(task, strdup("Playlist directory not found"));
task_set_finished(task, true);
free(state);
@ -149,6 +151,7 @@ static void task_netplay_crc_scan_handler(retro_task_t *task)
state->found = true;
task_set_data(task, state);
task_set_progress(task, 100);
task_free_title(task);
task_set_title(task, strdup(msg_hash_to_str(MENU_ENUM_LABEL_VALUE_NETPLAY_COMPAT_CONTENT_FOUND)));
task_set_finished(task, true);
string_list_free(state->lpl_list);
@ -209,6 +212,7 @@ filename_matching:
state->found = true;
task_set_data(task, state);
task_set_progress(task, 100);
task_free_title(task);
task_set_title(task, strdup(msg_hash_to_str(MENU_ENUM_LABEL_VALUE_NETPLAY_COMPAT_CONTENT_FOUND)));
task_set_finished(task, true);
string_list_free(state->lpl_list);
@ -232,6 +236,7 @@ filename_matching:
state->found = true;
task_set_data(task, state);
task_set_progress(task, 100);
task_free_title(task);
task_set_title(task, strdup(msg_hash_to_str(MENU_ENUM_LABEL_VALUE_NETPLAY_COMPAT_CONTENT_FOUND)));
task_set_finished(task, true);
return;
@ -240,6 +245,7 @@ filename_matching:
no_playlists:
string_list_free(state->lpl_list);
task_set_progress(task, 100);
task_free_title(task);
task_set_title(task, strdup("Content not found, try manual load or disconnect from host"));
task_set_finished(task, true);
command_event(CMD_EVENT_NETPLAY_INIT_DIRECT_DEFERRED, state->hostname);