mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-01-31 15:32:59 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3616 from bparker06/mem

Browse Source 
fix memory corruption due to wrong userdata type
This commit is contained in:
Twinaphex 2016-09-18 20:33:37 +02:00 committed by GitHub
commit ccd6a3d3f5
1 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
tasks/task_decompress.c
View File

@ -140,7 +140,7 @@ static void task_decompress_handler_finished(retro_task_t *task,
free(dec->source_file);
else
{
decompress_task_data_t *data =
decompress_task_data_t *data =
(decompress_task_data_t*)calloc(1, sizeof(*data));
data->source_file = dec->source_file;
@ -159,9 +159,11 @@ static void task_decompress_handler(retro_task_t *task)
{
bool retdec = false;
decompress_state_t *dec = (decompress_state_t*)task->state;
struct archive_extract_userdata userdata = {0};
int ret = file_archive_parse_file_iterate(&dec->archive,
&retdec, dec->source_file,
dec->valid_ext, file_decompressed, dec);
dec->valid_ext, file_decompressed, &userdata);
task->progress = file_archive_parse_file_progress(&dec->archive);
@ -197,9 +199,11 @@ static void task_decompress_handler_subdir(retro_task_t *task)
{
bool retdec;
decompress_state_t *dec = (decompress_state_t*)task->state;
struct archive_extract_userdata userdata = {0};
int ret = file_archive_parse_file_iterate(&dec->archive,
&retdec, dec->source_file,
dec->valid_ext, file_decompressed_subdir, dec);
dec->valid_ext, file_decompressed_subdir, &userdata);
task->progress = file_archive_parse_file_progress(&dec->archive);
@ -256,8 +260,8 @@ bool task_push_decompress(
}
/* ZIP or APK only */
if (!path_file_exists(source_file) ||
msg_hash_to_file_type(msg_hash_calculate(path_get_extension(source_file)))
if (!path_file_exists(source_file) ||
msg_hash_to_file_type(msg_hash_calculate(path_get_extension(source_file)))
!= FILE_TYPE_COMPRESSED)
{
RARCH_WARN("[decompress] File '%s' does not exist or is not a compressed file.\n",