Coverity: Now we have optional flags, make sure to validate optarg

In theory getopt_long() should do this for us, but Coverity doesn't understand it. What it does understand is that sometimes we check something for a null - we should check it all the time. Make it so. Signed-off-by: Robin Getz <[email protected]>
analogdevicesinc · Jun 2, 2020 · b87c71d · b87c71d
1 parent c9250c0
commit b87c71d
Show file tree

Hide file tree

Showing 5 changed files with 52 additions and 0 deletions.
diff --git a/tests/iio_adi_xflow_check.c b/tests/iio_adi_xflow_check.c
@@ -186,6 +186,10 @@ int main(int argc, char **argv)
 			break;
 
 		case 's':
+			if (!optarg) {
+				fprintf(stderr, "Samples options requires a value.\n\n");
+				return EXIT_FAILURE;
+			}
 			ret = sscanf(optarg, "%u%c", &buffer_size, &unit);
 			if (ret == 0)
 				return EXIT_FAILURE;

diff --git a/tests/iio_attr.c b/tests/iio_attr.c
@@ -411,6 +411,10 @@ int main(int argc, char **argv)
 			quiet = true;
 			break;
 		case 'g':
+			if (!optarg) {
+				fprintf(stderr, "Code generation requires an option\n");
+				return EXIT_FAILURE;
+			}
 			gen_code = true;
 			gen_file = optarg;
 			break;

diff --git a/tests/iio_common.c b/tests/iio_common.c
@@ -232,6 +232,10 @@ struct iio_context * handle_common_opts(char * name, int argc, char * const argv
 				fprintf(stderr, "-a, -x, -n and -u are mutually exclusive\n");
 				return NULL;
 			}
+			if (!optarg) {
+				fprintf(stderr, "network options requires a uri\n");
+				return NULL;
+			}
 			backend = IIO_NETWORK;
 			arg = optarg;
 			break;
@@ -240,6 +244,10 @@ struct iio_context * handle_common_opts(char * name, int argc, char * const argv
 				fprintf(stderr, "-a, -x, -n and -u are mutually exclusive\n");
 				return NULL;
 			}
+			if (!optarg) {
+				fprintf(stderr, "xml options requires a uri\n");
+				return NULL;
+			}
 			backend = IIO_XML;
 			arg = optarg;
 			break;
@@ -248,6 +256,10 @@ struct iio_context * handle_common_opts(char * name, int argc, char * const argv
 				fprintf(stderr, "-a, -x, -n and -u are mutually exclusive\n");
 				return NULL;
 			}
+			if (!optarg) {
+				fprintf(stderr, "uri options requires a uri\n");
+				return NULL;
+			}
 			backend = IIO_AUTO;
 			arg = optarg;
 			break;

diff --git a/tests/iio_readdev.c b/tests/iio_readdev.c
@@ -219,15 +219,31 @@ int main(int argc, char **argv)
 				optind++;
 			break;
 		case 't':
+			if (!optarg) {
+				fprintf(stderr, "Trigger requires an argument\n");
+				return EXIT_FAILURE;
+			}
 			trigger_name = optarg;
 			break;
 		case 'b':
+			if (!optarg) {
+				fprintf(stderr, "Buffersize requires an argument\n");
+				return EXIT_FAILURE;
+			}
 			buffer_size = sanitize_clamp("buffer size", optarg, 64, 4 * 1024 * 1024);
 			break;
 		case 's':
+			if (!optarg) {
+				fprintf(stderr, "Number of Samples requires an argument\n");
+				return EXIT_FAILURE;
+			}
 			num_samples = sanitize_clamp("number of samples", optarg, 0, SIZE_MAX);
 			break;
 		case 'T':
+			if (!optarg) {
+				fprintf(stderr, "Timeout requires an argument\n");
+				return EXIT_FAILURE;
+			}
 			timeout = sanitize_clamp("timeout", optarg, 0, INT_MAX);
 			break;
 		case '?':

diff --git a/tests/iio_writedev.c b/tests/iio_writedev.c
@@ -230,15 +230,31 @@ int main(int argc, char **argv)
 				optind++;
 			break;
 		case 't':
+			if (!optarg) {
+				fprintf(stderr, "Trigger requires argument\n");
+				return EXIT_FAILURE;
+			}
 			trigger_name = optarg;
 			break;
 		case 'b':
+			if (!optarg) {
+				fprintf(stderr, "Buffer Size requires argument\n");
+				return EXIT_FAILURE;
+			}
 			buffer_size = sanitize_clamp("buffer size", optarg, 64, 4 * 1024 * 1024);
 			break;
 		case 's':
+			if (!optarg) {
+				fprintf(stderr, "Number of samples requires argument\n");
+				return EXIT_FAILURE;
+			}
 			num_samples = sanitize_clamp("number of samples", optarg, 0, SIZE_MAX);
 			break;
 		case 'T':
+			if (!optarg) {
+				fprintf(stderr, "Timeout requires argument\n");
+				return EXIT_FAILURE;
+			}
 			timeout = sanitize_clamp("timeout", optarg, 0, INT_MAX);
 			break;
 		case 'c':