Skip to content

Commit b5c2124

Browse files
authored
Merge pull request #15373 from Martyx00/master
Check CAN DLC length value
2 parents 81f40fc + b6de6bc commit b5c2124

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

targets/TARGET_STM/can_api.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1024,7 +1024,7 @@ int can_read(can_t *obj, CAN_Message *msg, int handle)
10241024

10251025
msg->type = (CANType)(((uint8_t)0x02 & can->sFIFOMailBox[rxfifo_default].RIR) >> 1);
10261026
/* Get the DLC */
1027-
msg->len = (uint8_t)0x0F & can->sFIFOMailBox[rxfifo_default].RDTR;
1027+
msg->len = ((uint8_t)0x0F & can->sFIFOMailBox[rxfifo_default].RDTR < 8) ? ((uint8_t)0x0F & can->sFIFOMailBox[rxfifo_default].RDTR) : ((uint8_t) 8);
10281028
/* Get the FMI */
10291029
// msg->FMI = (uint8_t)0xFF & (can->sFIFOMailBox[rxfifo_default].RDTR >> 8);
10301030
/* Get the data field */

0 commit comments

Comments
 (0)