sven
/
can-utils
mirror of https://github.com/linux-can/can-utils.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fixed parse_canframe() with reordering the checks for the can_id 

delimiter. Before this fix the function may have found delimiters in the 
string behind the terminating zero.
pull/7/head
Oliver Hartkopp 2008-11-28 21:50:24 +00:00
parent e7046e7fca
commit 450a058072
1 changed files with 11 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
lib.c
View File

@ -114,10 +114,16 @@ int parse_canframe(char *cs, struct can_frame *cf) {
if (len < 4) if (len < 4)
return 1; return 1;
if (!((cs[3] == CANID_DELIM) || (cs[8] == CANID_DELIM))) if (cs[3] == CANID_DELIM) { /* 3 digits */
return 1;
if (cs[8] == CANID_DELIM) { /* 8 digits */ idx = 4;
for (i=0; i<3; i++){
if ((tmp = asc2nibble(cs[i])) > 0x0F)
return 1;
cf->can_id |= (tmp << (2-i)*4);
}
} else if (cs[8] == CANID_DELIM) { /* 8 digits */
idx = 9; idx = 9;
for (i=0; i<8; i++){ for (i=0; i<8; i++){
@ -128,15 +134,8 @@ int parse_canframe(char *cs, struct can_frame *cf) {
if (!(cf->can_id & CAN_ERR_FLAG)) /* 8 digits but no errorframe? */ if (!(cf->can_id & CAN_ERR_FLAG)) /* 8 digits but no errorframe? */
cf->can_id |= CAN_EFF_FLAG; /* then it is an extended frame */ cf->can_id |= CAN_EFF_FLAG; /* then it is an extended frame */
} else { /* 3 digits */ } else
return 1;
idx = 4;
for (i=0; i<3; i++){
if ((tmp = asc2nibble(cs[i])) > 0x0F)
return 1;
cf->can_id |= (tmp << (2-i)*4);
}
}
if((cs[idx] == 'R') || (cs[idx] == 'r')){ /* RTR frame */ if((cs[idx] == 'R') || (cs[idx] == 'r')){ /* RTR frame */
cf->can_id |= CAN_RTR_FLAG; cf->can_id |= CAN_RTR_FLAG;