flash/atsame5: use COMMAND_PARSE_NUMBER in command handlers
authorTarek BOCHKATI <tarek.bouchkati@gmail.com>
Thu, 29 Jul 2021 22:46:31 +0000 (23:46 +0100)
committerAntonio Borneo <borneo.antonio@gmail.com>
Sun, 22 Aug 2021 13:19:16 +0000 (13:19 +0000)
the usage of COMMAND_PARSE_NUMBER is safer in COMMAND_HANDLERs since it provides
better error checking than strto** functions.

Change-Id: Ia7fe9c4017108616f21676f115f151ac62924205
Signed-off-by: Tarek BOCHKATI <tarek.bouchkati@gmail.com>
Reviewed-on: https://review.openocd.org/c/openocd/+/6423
Reviewed-by: Antonio Borneo <borneo.antonio@gmail.com>
Tested-by: jenkins
src/flash/nor/atsame5.c

index 7c7e5d0f0b130a871198c29856c277c728be7407..203c470cab1b85593fb035d2f957725e96ebcd2a 100644 (file)
@@ -797,11 +797,12 @@ COMMAND_HANDLER(same5_handle_userpage_command)
        }
 
        if (CMD_ARGC >= 1) {
-               uint64_t mask = NVMUSERROW_SAM_E5_D5_MASK;
-               uint64_t value = strtoull(CMD_ARGV[0], NULL, 0);
+               uint64_t value, mask = NVMUSERROW_SAM_E5_D5_MASK;
+               COMMAND_PARSE_NUMBER(u64, CMD_ARGV[0], value);
 
                if (CMD_ARGC == 2) {
-                       uint64_t mask_temp = strtoull(CMD_ARGV[1], NULL, 0);
+                       uint64_t mask_temp;
+                       COMMAND_PARSE_NUMBER(u64, CMD_ARGV[1], mask_temp);
                        mask &= mask_temp;
                }
 
@@ -837,7 +838,9 @@ COMMAND_HANDLER(same5_handle_bootloader_command)
                return ERROR_FAIL;
 
        if (CMD_ARGC >= 1) {
-               unsigned long size = strtoul(CMD_ARGV[0], NULL, 0);
+               unsigned long size;
+
+               COMMAND_PARSE_NUMBER(ulong, CMD_ARGV[0], size);
                uint32_t code = (size + 8191) / 8192;
                if (code > 15) {
                        command_print(CMD, "Invalid bootloader size.  Please "