mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-04-01 04:20:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #8010 from rzumer/lynx-cheevos-fix

Browse Source 
Hash full Lynx file content
This commit is contained in:
Twinaphex 2019-01-19 19:30:47 +01:00 committed by GitHub
commit 8c5f4a842c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
cheevos/cheevos.c
View File

@ -2571,7 +2571,8 @@ enum
static int cheevos_iterate(coro_t *coro) static int cheevos_iterate(coro_t *coro)
{ {
const int SNES_HEADER_LEN = 0x200; const int snes_header_len = 0x200;
const int lynx_header_len = 0x40;
ssize_t num_read = 0; ssize_t num_read = 0;
size_t to_read = 4096; size_t to_read = 4096;
uint8_t *buffer = NULL; uint8_t *buffer = NULL;
@ -2615,7 +2616,7 @@ static int cheevos_iterate(coro_t *coro)
{ {
{SNES_MD5, "SNES (discards header)", snes_exts}, {SNES_MD5, "SNES (discards header)", snes_exts},
{GENESIS_MD5, "Genesis (6Mb padding)", genesis_exts}, {GENESIS_MD5, "Genesis (6Mb padding)", genesis_exts},
{LYNX_MD5, "Atari Lynx (only first 512 bytes)", lynx_exts}, {LYNX_MD5, "Atari Lynx (discards header)", lynx_exts},
{NES_MD5, "NES (discards header)", NULL}, {NES_MD5, "NES (discards header)", NULL},
{GENERIC_MD5, "Generic (plain content)", NULL}, {GENERIC_MD5, "Generic (plain content)", NULL},
{FILENAME_MD5, "Generic (filename)", NULL} {FILENAME_MD5, "Generic (filename)", NULL}
@ -2904,7 +2905,7 @@ found:
/* Checks for the existence of a headered SNES file. /* Checks for the existence of a headered SNES file.
Unheadered files fall back to GENERIC_MD5. */ Unheadered files fall back to GENERIC_MD5. */
if (coro->len < 0x2000 || coro->len % 0x2000 != SNES_HEADER_LEN) if (coro->len < 0x2000 || coro->len % 0x2000 != snes_header_len)
{ {
coro->gameid = 0; coro->gameid = 0;
CORO_RET(); CORO_RET();
@ -2955,16 +2956,19 @@ found:
*************************************************************************/ *************************************************************************/
CORO_SUB(LYNX_MD5) CORO_SUB(LYNX_MD5)
if (coro->len < 0x0240) /* Checks for the existence of a headered Lynx file.
Unheadered files fall back to GENERIC_MD5. */
if (coro->len <= lynx_header_len ||
memcmp("LYNX", (void *)coro->data, 5) != 0)
{ {
coro->gameid = 0; coro->gameid = 0;
CORO_RET(); CORO_RET();
} }
MD5_Init(&coro->md5); MD5_Init(&coro->md5);
coro->offset = lynx_header_len;
coro->offset = 0x0040; coro->count = coro->len - lynx_header_len;
coro->count = 0x0200;
CORO_GOSUB(EVAL_MD5); CORO_GOSUB(EVAL_MD5);
MD5_Final(coro->hash, &coro->md5); MD5_Final(coro->hash, &coro->md5);