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

Merge pull request #4596 from leiradel/master 

Fixed crash in cheevos_get_description
This commit is contained in:
Twinaphex 2017-02-08 21:43:53 +01:00 committed by GitHub
parent bd8ecd9dfd 3785fc4524
commit 8d2bafb279
1 changed files with 15 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
cheevos/cheevos.c
View File

@ -3227,15 +3227,23 @@ void cheevos_populate_menu(void *data, bool hardcore)
bool cheevos_get_description(cheevos_ctx_desc_t *desc)
{
cheevo_t *cheevos = cheevos_locals.core.cheevos;
if (desc->idx >= cheevos_locals.core.count)
if (cheevos_loaded)
{
cheevos = cheevos_locals.unofficial.cheevos;
desc->idx -= cheevos_locals.unofficial.count;
cheevo_t *cheevos = cheevos_locals.core.cheevos;
if (desc->idx >= cheevos_locals.core.count)
{
cheevos = cheevos_locals.unofficial.cheevos;
desc->idx -= cheevos_locals.unofficial.count;
}
strlcpy(desc->s, cheevos[desc->idx].description, desc->len);
}
else
{
*desc->s = 0;
}
strlcpy(desc->s, cheevos[desc->idx].description, desc->len);
return true;
}