It is necessary to prevent dereferencing of a NULL pointer. Found with the SVACE static analysis tool. --- tools/rctest.c | 30 +++++++++++++++++++++++------- 1 file changed, 23 insertions(+), 7 deletions(-) diff --git a/tools/rctest.c b/tools/rctest.c index b72be917c..367e41e3c 100644 --- a/tools/rctest.c +++ b/tools/rctest.c @@ -742,6 +742,9 @@ int main(int argc, char *argv[]) break; case 'a': + if (!optarg) + break; + mode = AUTO; if (!strncasecmp(optarg, "hci", 3)) @@ -756,6 +759,9 @@ int main(int argc, char *argv[]) break; case 'i': + if (!optarg) + break; + if (!strncasecmp(optarg, "hci", 3)) hci_devba(atoi(optarg + 3), &bdaddr); else @@ -763,10 +769,14 @@ int main(int argc, char *argv[]) break; case 'P': - channel = atoi(optarg); + if (optarg) + channel = atoi(optarg); break; case 'U': + if (!optarg) + break; + if (!strcasecmp(optarg, "spp")) uuid = SERIAL_PORT_SVCLASS_ID; else if (!strncasecmp(optarg, "0x", 2)) @@ -792,11 +802,13 @@ int main(int argc, char *argv[]) break; case 'L': - linger = atoi(optarg); + if (optarg) + linger = atoi(optarg); break; case 'W': - defer_setup = atoi(optarg); + if (optarg) + defer_setup = atoi(optarg); break; case 'B': @@ -808,19 +820,23 @@ int main(int argc, char *argv[]) break; case 'N': - num_frames = atoi(optarg); + if (optarg) + num_frames = atoi(optarg); break; case 'C': - count = atoi(optarg); + if (optarg) + count = atoi(optarg); break; case 'D': - delay = atoi(optarg) * 1000; + if (optarg) + delay = atoi(optarg) * 1000; break; case 'Y': - priority = atoi(optarg); + if (optarg) + priority = atoi(optarg); break; case 'T': -- 2.43.0