sven/can-utils
1
0
Fork 0
mirror of https://github.com/linux-can/can-utils.git synced 2026-09-22 16:09:52 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fix datatype issue in sscanf() on 64bit systems.

Browse Source 
On 64bit systems a 'long' is a 64bit value but the target values of scanf()
are always 32bit in the affected code - which means just an 'unsigned int'.
Unsigned int is fine on 32 and 64 bit systems.

Thanks to Andre Naujoks for reporting this issue.
This commit is contained in:
Oliver Hartkopp
2010-09-25 10:24:37 +00:00
parent 1463ee4ce4
commit d3468d907f
2 changed files with 8 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
cangw.c
+5 -8
View File
@@ -328,8 +328,7 @@ int parse_mod(char *optarg, struct modattr *modmsg)
ptr++;
}
if (sscanf(++ptr, "%lx.%hhx.%16s",
(long unsigned int *)&modmsg->cf.can_id,
if (sscanf(++ptr, "%x.%hhx.%16s", &modmsg->cf.can_id,
(unsigned char *)&modmsg->cf.can_dlc, hexdata) != 3)
return 5;
@@ -593,13 +592,11 @@ int main(int argc, char **argv)
break;
case 'f':
if (sscanf(optarg, "%lx:%lx",
(long unsigned int *)&filter.can_id,
(long unsigned int *)&filter.can_mask) == 2) {
if (sscanf(optarg, "%x:%x", &filter.can_id,
&filter.can_mask) == 2) {
have_filter = 1;
} else if (sscanf(optarg, "%lx~%lx",
(long unsigned int *)&filter.can_id,
(long unsigned int *)&filter.can_mask) == 2) {
} else if (sscanf(optarg, "%x~%x", &filter.can_id,
&filter.can_mask) == 2) {
filter.can_id |= CAN_INV_FILTER;
have_filter = 1;
} else {