github.com/Interlisp.maiko
1
0
Fork 0
mirror of https://github.com/Interlisp/maiko.git synced 2026-05-03 23:09:34 +00:00
Code Issues Projects Releases Wiki Activity

Avoid use of sscanf() for parsing simple integer values (#396)

Browse Source 
There is no reason to use sscanf() rather than strtol()/strtoul()
for parsing simple integer values from a string.
Resolves a number of cert-str34-c warnings from clang-tidy.
This commit is contained in:
Nick Briggs
2021-09-12 14:24:05 -07:00
committed by GitHub
parent c7adb3c4ba
commit a70b18d444
1 changed files with 38 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

57
src/uraid.c
View File

@@ -19,6 +19,7 @@
/************************************************************************/ /************************************************************************/
/************************************************************************/ /************************************************************************/
#include <errno.h>
#include <fcntl.h> #include <fcntl.h>
#include <signal.h> #include <signal.h>
#include <stdio.h> #include <stdio.h>
@@ -349,6 +350,7 @@ unsigned int uGetTN(unsigned int address) {
LispPTR uraid_commands() { LispPTR uraid_commands() {
int num, address, val; int num, address, val;
char *endpointer;
LispPTR index; LispPTR index;
DefCell *defcell68k; DefCell *defcell68k;
#ifndef DOS #ifndef DOS
@@ -383,7 +385,9 @@ LispPTR uraid_commands() {
printf("DUMP-STACK: f decimal-FXnumber\n"); printf("DUMP-STACK: f decimal-FXnumber\n");
return (T); return (T);
} }
if (sscanf(URaid_arg1, "%d", &num) <= 0) { /* com read fails */ errno = 0;
num = strtoul(URaid_arg1, &endpointer, 10);
if (errno != 0 || *endpointer != '\0') { /* com read fails */
printf("Illegal argument, not decimal number\n"); printf("Illegal argument, not decimal number\n");
return (T); return (T);
} }
@@ -511,7 +515,9 @@ LispPTR uraid_commands() {
printf("PRINT-INSTANCE: O HEX-LispAddress\n"); printf("PRINT-INSTANCE: O HEX-LispAddress\n");
return (T); return (T);
} }
if (sscanf(URaid_arg1, "%x", &objaddr) <= 0) { errno = 0;
objaddr = strtoul(URaid_arg1, &endpointer, 16);
if (errno != 0 || *endpointer != '\0') {
printf("Arg not HEX number\n"); printf("Arg not HEX number\n");
return (T); return (T);
} }
@@ -524,7 +530,9 @@ LispPTR uraid_commands() {
} }
/**HEXNUMP(URaid_arg1,"Not Address");**/ /**HEXNUMP(URaid_arg1,"Not Address");**/
if (sscanf(URaid_arg1, "%x", &address) <= 0) { errno = 0;
address = strtoul(URaid_arg1, &endpointer, 16);
if (errno != 0 || *endpointer != '\0') {
printf("Arg not HEX number\n"); printf("Arg not HEX number\n");
return (T); return (T);
} }
@@ -609,17 +617,21 @@ LispPTR uraid_commands() {
printf("HEX-DUMP: x Xaddress [Xnum]\n"); printf("HEX-DUMP: x Xaddress [Xnum]\n");
return (T); return (T);
} }
if (sscanf(URaid_arg1, "%x", &address) <= 0) { /* arg1 not HEX */ errno = 0;
address = strtoul(URaid_arg1, &endpointer, 16);
if (errno != 0 || *endpointer != '\0') {
printf("Arg(Xaddress) not Xaddress\n"); printf("Arg(Xaddress) not Xaddress\n");
return (T); return (T);
} }
switch (sscanf(URaid_arg2, "%x", &num)) { if (URaid_arg2[0] == '\0') {
case -1: /* Use defaultval for word-num */ num = XDUMPW; break; num = XDUMPW;
case 0: /* Illegal number */ } else {
errno = 0;
num = strtol(URaid_arg2, &endpointer, 16);
if (errno != 0 || *endpointer != '\0') {
printf("Arg(Xnum) not Xnum\n"); printf("Arg(Xnum) not Xnum\n");
return (T); return (T);
/* break; */ }
default: break;
} }
if (num < 0) { if (num < 0) {
printf("Dump words num should be positive\n"); printf("Dump words num should be positive\n");
@@ -657,7 +669,9 @@ LispPTR uraid_commands() {
} else if (*URaid_arg2 == 'T') } else if (*URaid_arg2 == 'T')
val = ATOM_T; val = ATOM_T;
else { else {
if (sscanf(URaid_arg2, "%d", &val) == -1) { errno = 0;
val = strtol(URaid_arg2, &endpointer, 10);
if (errno != 0 || *endpointer != '\0') {
printf(" Bad value\n"); printf(" Bad value\n");
return (T); return (T);
} else { } else {
@@ -691,11 +705,15 @@ LispPTR uraid_commands() {
HEXNUMP(URaid_arg2,"Not Proper Value"); HEXNUMP(URaid_arg2,"Not Proper Value");
***/ ***/
if (sscanf(URaid_arg1, "%x", &address) <= 0) { errno = 0;
address = strtol(URaid_arg1, &endpointer, 16);
if (errno != 0 || *endpointer != '\0') {
printf("Arg(Xaddress) not Xaddress\n"); printf("Arg(Xaddress) not Xaddress\n");
return (T); return (T);
} }
if (sscanf(URaid_arg2, "%x", &val) <= 0) { errno = 0;
val = strtol(URaid_arg2, &endpointer, 16);
if (errno != 0 || *endpointer != '\0') {
printf("Arg(Xval) not Xaddress\n"); printf("Arg(Xval) not Xaddress\n");
return (T); return (T);
} }
@@ -791,13 +809,14 @@ LispPTR uraid_commands() {
case '(': case '(':
if (URaid_argnum == 1) if (URaid_argnum == 1)
num = 2; num = 2;
else {
else if ((URaid_arg1[0] < '0') || (URaid_arg1[0] > '9')) { errno = 0;
printf("Illegal argument, not number\n"); num = strtoul(URaid_arg1, &endpointer, 10);
return (T); if (errno != 0 || *endpointer != '\0') {
} else printf("Illegal argument, not number\n");
sscanf(URaid_arg1, "%d", &num); return (T);
}
}
PrintMaxLevel = num; PrintMaxLevel = num;
printf("PrintLevel is set to %d.", num); printf("PrintLevel is set to %d.", num);
break; break;