imi415
/
openocd
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

flash/kinetis: use COMMAND_PARSE_NUMBER in command handlers 

the usage of COMMAND_PARSE_NUMBER is safer in COMMAND_HANDLERs since it provides
better error checking than strto** functions.

Change-Id: I972da1a75ba7c41c1b714c2429289c3d24594235
Signed-off-by: Tarek BOCHKATI <tarek.bouchkati@gmail.com>
Reviewed-on: https://review.openocd.org/c/openocd/+/6422
Reviewed-by: Antonio Borneo <borneo.antonio@gmail.com>
Tested-by: jenkins
This commit is contained in:
Tarek BOCHKATI 2021-07-29 23:46:09 +01:00 committed by Antonio Borneo
parent 01da8f6c2a
commit 3caa18729c
1 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/flash/nor/kinetis.c
View File

@ -2890,7 +2890,7 @@ COMMAND_HANDLER(kinetis_nvm_partition)
else if (strcmp(CMD_ARGV[0], "eebkp") == 0) else if (strcmp(CMD_ARGV[0], "eebkp") == 0)
sz_type = EEBKP_SIZE; sz_type = EEBKP_SIZE;
par = strtoul(CMD_ARGV[1], NULL, 10); COMMAND_PARSE_NUMBER(ulong, CMD_ARGV[1], par);
while (par >> (log2 + 3)) while (par >> (log2 + 3))
log2++; log2++;
} }
@ -2945,11 +2945,13 @@ COMMAND_HANDLER(kinetis_nvm_partition)
break; break;
} }
if (CMD_ARGC == 3) if (CMD_ARGC == 3) {
ee1 = ee2 = strtoul(CMD_ARGV[2], NULL, 10) / 2; unsigned long eex;
else if (CMD_ARGC >= 4) { COMMAND_PARSE_NUMBER(ulong, CMD_ARGV[2], eex);
ee1 = strtoul(CMD_ARGV[2], NULL, 10); ee1 = ee2 = eex / 2;
ee2 = strtoul(CMD_ARGV[3], NULL, 10); } else if (CMD_ARGC >= 4) {
COMMAND_PARSE_NUMBER(ulong, CMD_ARGV[2], ee1);
COMMAND_PARSE_NUMBER(ulong, CMD_ARGV[3], ee2);
} }
enable = ee1 + ee2 > 0; enable = ee1 + ee2 > 0;
@ -3044,7 +3046,7 @@ COMMAND_HANDLER(kinetis_fopt_handler)
return ERROR_COMMAND_SYNTAX_ERROR; return ERROR_COMMAND_SYNTAX_ERROR;
if (CMD_ARGC == 1) { if (CMD_ARGC == 1) {
fcf_fopt = (uint8_t)strtoul(CMD_ARGV[0], NULL, 0); COMMAND_PARSE_NUMBER(u8, CMD_ARGV[0], fcf_fopt);
} else { } else {
command_print(CMD, "FCF_FOPT 0x%02" PRIx8, fcf_fopt); command_print(CMD, "FCF_FOPT 0x%02" PRIx8, fcf_fopt);
} }