Potential issues found by static analysis.

This commit is contained in:
wb2osz 2018-01-01 21:38:50 -05:00
parent 6ffef6ed52
commit 78283e1991
3 changed files with 37 additions and 3 deletions

View File

@ -594,7 +594,10 @@ static char *split (char *string, int rest_of_line)
{ {
static char cmd[MAXCMDLEN]; static char cmd[MAXCMDLEN];
static char token[MAXCMDLEN]; static char token[MAXCMDLEN];
static char *c; // current position in cmd. static char shutup[] = " "; // Shut up static analysis which gets upset
// over the case where this could be called with
// string NULL and c was not yet initialized.
static char *c = shutup; // Current position in command line.
char *s, *t; char *s, *t;
int in_quotes; int in_quotes;

View File

@ -4801,7 +4801,7 @@ int main (int argc, char *argv[])
if (bytes[0] == FEND) { if (bytes[0] == FEND) {
if (bytes[1] != 0) { if (num_bytes < 2 || bytes[1] != 0) {
text_color_set(DW_COLOR_ERROR); text_color_set(DW_COLOR_ERROR);
dw_printf("Was expecting to find 00 after the initial C0.\n"); dw_printf("Was expecting to find 00 after the initial C0.\n");
continue; continue;

View File

@ -545,7 +545,8 @@ void kiss_process_msg (unsigned char *kiss_msg, int kiss_len, int debug, int cli
/* Our current default is a maximum of 6 channels but it is easily */ /* Our current default is a maximum of 6 channels but it is easily */
/* increased by changing one number and recompiling. */ /* increased by changing one number and recompiling. */
if ((port == 2 || port == 8) && if (kiss_len > 16 &&
(port == 2 || port == 8) &&
kiss_msg[1] == 'Q' << 1 && kiss_msg[1] == 'Q' << 1 &&
kiss_msg[2] == 'S' << 1 && kiss_msg[2] == 'S' << 1 &&
kiss_msg[3] == 'T' << 1 && kiss_msg[3] == 'T' << 1 &&
@ -596,6 +597,11 @@ void kiss_process_msg (unsigned char *kiss_msg, int kiss_len, int debug, int cli
case KISS_CMD_TXDELAY: /* 1 = TXDELAY */ case KISS_CMD_TXDELAY: /* 1 = TXDELAY */
if (kiss_len < 2) {
text_color_set(DW_COLOR_ERROR);
dw_printf ("KISS ERROR: Missing value for TXDELAY command.\n");
return;
}
text_color_set(DW_COLOR_INFO); text_color_set(DW_COLOR_INFO);
dw_printf ("KISS protocol set TXDELAY = %d (*10mS units = %d mS), port %d\n", kiss_msg[1], kiss_msg[1] * 10, port); dw_printf ("KISS protocol set TXDELAY = %d (*10mS units = %d mS), port %d\n", kiss_msg[1], kiss_msg[1] * 10, port);
if (kiss_msg[1] < 4 || kiss_msg[1] > 100) { if (kiss_msg[1] < 4 || kiss_msg[1] > 100) {
@ -608,6 +614,11 @@ void kiss_process_msg (unsigned char *kiss_msg, int kiss_len, int debug, int cli
case KISS_CMD_PERSISTENCE: /* 2 = Persistence */ case KISS_CMD_PERSISTENCE: /* 2 = Persistence */
if (kiss_len < 2) {
text_color_set(DW_COLOR_ERROR);
dw_printf ("KISS ERROR: Missing value for PERSISTENCE command.\n");
return;
}
text_color_set(DW_COLOR_INFO); text_color_set(DW_COLOR_INFO);
dw_printf ("KISS protocol set Persistence = %d, port %d\n", kiss_msg[1], port); dw_printf ("KISS protocol set Persistence = %d, port %d\n", kiss_msg[1], port);
if (kiss_msg[1] < 5 || kiss_msg[1] > 250) { if (kiss_msg[1] < 5 || kiss_msg[1] > 250) {
@ -620,6 +631,11 @@ void kiss_process_msg (unsigned char *kiss_msg, int kiss_len, int debug, int cli
case KISS_CMD_SLOTTIME: /* 3 = SlotTime */ case KISS_CMD_SLOTTIME: /* 3 = SlotTime */
if (kiss_len < 2) {
text_color_set(DW_COLOR_ERROR);
dw_printf ("KISS ERROR: Missing value for SLOTTIME command.\n");
return;
}
text_color_set(DW_COLOR_INFO); text_color_set(DW_COLOR_INFO);
dw_printf ("KISS protocol set SlotTime = %d (*10mS units = %d mS), port %d\n", kiss_msg[1], kiss_msg[1] * 10, port); dw_printf ("KISS protocol set SlotTime = %d (*10mS units = %d mS), port %d\n", kiss_msg[1], kiss_msg[1] * 10, port);
if (kiss_msg[1] < 2 || kiss_msg[1] > 50) { if (kiss_msg[1] < 2 || kiss_msg[1] > 50) {
@ -632,6 +648,11 @@ void kiss_process_msg (unsigned char *kiss_msg, int kiss_len, int debug, int cli
case KISS_CMD_TXTAIL: /* 4 = TXtail */ case KISS_CMD_TXTAIL: /* 4 = TXtail */
if (kiss_len < 2) {
text_color_set(DW_COLOR_ERROR);
dw_printf ("KISS ERROR: Missing value for TXTAIL command.\n");
return;
}
text_color_set(DW_COLOR_INFO); text_color_set(DW_COLOR_INFO);
dw_printf ("KISS protocol set TXtail = %d (*10mS units = %d mS), port %d\n", kiss_msg[1], kiss_msg[1] * 10, port); dw_printf ("KISS protocol set TXtail = %d (*10mS units = %d mS), port %d\n", kiss_msg[1], kiss_msg[1] * 10, port);
if (kiss_msg[1] < 2) { if (kiss_msg[1] < 2) {
@ -644,6 +665,11 @@ void kiss_process_msg (unsigned char *kiss_msg, int kiss_len, int debug, int cli
case KISS_CMD_FULLDUPLEX: /* 5 = FullDuplex */ case KISS_CMD_FULLDUPLEX: /* 5 = FullDuplex */
if (kiss_len < 2) {
text_color_set(DW_COLOR_ERROR);
dw_printf ("KISS ERROR: Missing value for FULLDUPLEX command.\n");
return;
}
text_color_set(DW_COLOR_INFO); text_color_set(DW_COLOR_INFO);
dw_printf ("KISS protocol set FullDuplex = %d, port %d\n", kiss_msg[1], port); dw_printf ("KISS protocol set FullDuplex = %d, port %d\n", kiss_msg[1], port);
xmit_set_fulldup (port, kiss_msg[1]); xmit_set_fulldup (port, kiss_msg[1]);
@ -651,6 +677,11 @@ void kiss_process_msg (unsigned char *kiss_msg, int kiss_len, int debug, int cli
case KISS_CMD_SET_HARDWARE: /* 6 = TNC specific */ case KISS_CMD_SET_HARDWARE: /* 6 = TNC specific */
if (kiss_len < 2) {
text_color_set(DW_COLOR_ERROR);
dw_printf ("KISS ERROR: Missing value for SET HARDWARE command.\n");
return;
}
kiss_msg[kiss_len] = '\0'; kiss_msg[kiss_len] = '\0';
text_color_set(DW_COLOR_INFO); text_color_set(DW_COLOR_INFO);
dw_printf ("KISS protocol set hardware \"%s\", port %d\n", (char*)(kiss_msg+1), port); dw_printf ("KISS protocol set hardware \"%s\", port %d\n", (char*)(kiss_msg+1), port);