Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix fstGetUint32 crash on mips64el due to misaligned access #3906

Merged
merged 1 commit into from
Aug 28, 2023
Merged

Fix fstGetUint32 crash on mips64el due to misaligned access #3906

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 8 additions & 8 deletions libs/fst/fstapi.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -348,17 +348,17 @@ static void *fstMmap2(size_t __len, int __fd, fst_off_t __off)
#ifdef FST_DO_MISALIGNED_OPS
#define fstGetUint32(x) (*(uint32_t *)(x))
#else
static uint32_t fstGetUint32(unsigned char *mem)
static inline uint32_t fstGetUint32(unsigned char *mem)
{
uint32_t u32;
unsigned char *buf = (unsigned char *)(&u32);
union {
uint8_t u8[sizeof(uint32_t)];
uint32_t u32;
} u;

buf[0] = mem[0];
buf[1] = mem[1];
buf[2] = mem[2];
buf[3] = mem[3];
for (size_t i=0; i < sizeof(u.u8); i++)
u.u8[i] = mem[i];

return (*(uint32_t *)buf);
return u.u32;
}
#endif

Expand Down
Loading