tudattr
/
qmk_firmware
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Use memcpy instead of cast to avoid alignment issues

master
Fred Sundvik 2016-02-14 21:49:31 +02:00
parent f22d2543b1
commit 8d50880686
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
serial_link/protocol/frame_validator.c
View File

@ -104,7 +104,8 @@ static uint32_t crc32_byte(uint8_t *p, uint32_t bytelength)
void validator_recv_frame(uint8_t* data, uint16_t size) { void validator_recv_frame(uint8_t* data, uint16_t size) {
if (size > 4) { if (size > 4) {
uint32_t frame_crc = *(uint32_t*)(data + size - 4); uint32_t frame_crc;
memcpy(&frame_crc, data + size -4, 4);
uint32_t expected_crc = crc32_byte(data, size - 4); uint32_t expected_crc = crc32_byte(data, size - 4);
if (frame_crc == expected_crc) { if (frame_crc == expected_crc) {
route_incoming_frame(data, size-4); route_incoming_frame(data, size-4);
@ -113,7 +114,7 @@ void validator_recv_frame(uint8_t* data, uint16_t size) {
} }
void validator_send_frame(uint8_t* data, uint16_t size) { void validator_send_frame(uint8_t* data, uint16_t size) {
uint32_t* crc = (uint32_t*)(data + size); uint32_t crc = crc32_byte(data, size);
*crc = crc32_byte(data, size); memcpy(data + size, &crc, 4);
send_frame(data, size + 4); send_frame(data, size + 4);
} }