From: Tollef Fog Heen <tfheen@err.no>
Date: Fri, 10 Jul 2009 12:09:48 +0000 (+0200)
Subject: parallel: Argument validation
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4c46b498f7c42a037f4f00e54f8a6a0197a80c93;p=moreutils

parallel: Argument validation

Make sure the arguments passed to -j and -l are numbers and error out
if they are not.
---

diff --git a/parallel.c b/parallel.c
index 597cda2..418dc34 100644
--- a/parallel.c
+++ b/parallel.c
@@ -27,6 +27,7 @@
 #include <sys/time.h>
 #include <time.h>
 #include <stdlib.h>
+#include <errno.h>
 #include <sys/select.h>
 #include <sys/types.h>
 #include <sys/wait.h>
@@ -91,6 +92,7 @@ int main(int argc, char **argv)
 	int cidx = 0;
 	int returncode = 0;
 	int replace_cb = 0;
+	char *t;
 
 	while ((opt = getopt(argc, argv, "+hij:l:")) != -1) {
 		switch (opt) {
@@ -101,10 +103,22 @@ int main(int argc, char **argv)
 			replace_cb = 1;
 			break;
 		case 'j':
-			maxjobs = atoi(optarg);
+			errno = 0;
+			maxjobs = strtoul(optarg, &t, 0);
+			if (errno != 0 || (t-optarg) != strlen(optarg)) {
+				fprintf(stderr, "option '%s' is not a number\n",
+					optarg);
+				exit(2);
+			}
 			break;
 		case 'l':
-			maxload = atoi(optarg);
+			errno = 0;
+			maxload = strtoul(optarg, &t, 0);
+			if (errno != 0 || (t-optarg) != strlen(optarg)) {
+				fprintf(stderr, "option '%s' is not a number\n",
+					optarg);
+				exit(2);
+			}
 			break;
 		default: /* ’?’ */
 			usage();