mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-02-28 12:40:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix libretro-db loading on big endian platforms

Browse Source 
Wrong casting did read garbage data for numerical values on big endian platforms.
Numerical values are used for array/map lengths so this could easily cause random crashes during parsing but also later while using the data.
Use union to avoid strict aliasing warnings.
This commit is contained in:
Bernhard Schelling 2021-08-04 01:20:25 +09:00 committed by GitHub
parent bdba803909
commit 9956ff041e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 11 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
libretro-db/rmsgpack.c
View File

@ -398,7 +398,7 @@ error:
static int read_uint(RFILE *fd, uint64_t *out, size_t size) static int read_uint(RFILE *fd, uint64_t *out, size_t size)
{ {
uint64_t tmp; union { uint64_t u64; uint32_t u32; uint16_t u16; uint8_t u8; } tmp;
if (filestream_read(fd, &tmp, size) == -1) if (filestream_read(fd, &tmp, size) == -1)
goto error; goto error;
@ -406,16 +406,16 @@ static int read_uint(RFILE *fd, uint64_t *out, size_t size)
switch (size) switch (size)
{ {
case 1: case 1:
*out = *(uint8_t *)(&tmp); *out = tmp.u8;
break; break;
case 2: case 2:
*out = swap_if_little16((uint16_t)tmp); *out = swap_if_little16(tmp.u16);
break; break;
case 4: case 4:
*out = swap_if_little32((uint32_t)tmp); *out = swap_if_little32(tmp.u32);
break; break;
case 8: case 8:
*out = swap_if_little64(tmp); *out = swap_if_little64(tmp.u64);
break; break;
} }
return 0; return 0;
@ -426,32 +426,24 @@ error:
static int read_int(RFILE *fd, int64_t *out, size_t size) static int read_int(RFILE *fd, int64_t *out, size_t size)
{ {
uint8_t tmp8 = 0; union { uint64_t u64; uint32_t u32; uint16_t u16; uint8_t u8; } tmp;
uint16_t tmp16;
uint32_t tmp32;
uint64_t tmp64;
if (filestream_read(fd, &tmp64, size) == -1) if (filestream_read(fd, &tmp, size) == -1)
goto error; goto error;
(void)tmp8;
switch (size) switch (size)
{ {
case 1: case 1:
*out = *((int8_t *)(&tmp64)); *out = (int8_t)tmp.u8;
break; break;
case 2: case 2:
tmp16 = swap_if_little16((uint16_t)tmp64); *out = (int16_t)swap_if_little16(tmp.u16);
*out = *((int16_t *)(&tmp16));
break; break;
case 4: case 4:
tmp32 = swap_if_little32((uint32_t)tmp64); *out = (int32_t)swap_if_little32(tmp.u32);
*out = *((int32_t *)(&tmp32));
break; break;
case 8: case 8:
tmp64 = swap_if_little64(tmp64); *out = (int64_t)swap_if_little64(tmp.u64);
*out = *((int64_t *)(&tmp64));
break; break;
} }
return 0; return 0;