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

Merge pull request #8587 from rzumer/fix_cheevos_oob 

Check bounds of accessed memory for achievements
This commit is contained in:
Twinaphex 2019-04-15 19:40:49 +02:00 committed by GitHub
parent 3d7eb19abd dc37d56ac8
commit f9ce822a7b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
cheevos/var.c
View File

@ -295,8 +295,13 @@ uint8_t* cheevos_var_get_memory(const cheevos_var_t* var)
{
rarch_system_info_t* system = runloop_get_system_info();
if (system->mmaps.num_descriptors != 0)
if (system->mmaps.num_descriptors > var->bank_id)
{
if (var->value >= system->mmaps.descriptors[var->bank_id].core.len)
return NULL;
memory = (uint8_t*)system->mmaps.descriptors[var->bank_id].core.ptr;
}
else
{
retro_ctx_memory_info_t meminfo = {NULL, 0, 0};
@ -321,6 +326,10 @@ uint8_t* cheevos_var_get_memory(const cheevos_var_t* var)
}
core_get_memory(&meminfo);
if (var->value >= meminfo.size)
return NULL;
memory = (uint8_t*)meminfo.data;
}