empire/empserver
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fairland: Check positional arguments more thoroughly

Browse source 
fairland silently "corrects" some bad arguments.  Reject them instead.
It neglects to check others completely.  Fix that.

Signed-off-by: Markus Armbruster <armbru@pond.sub.org>
This commit is contained in:
Markus Armbruster 2020-08-10 15:24:30 +02:00
parent c206fe83c2
commit 3501df487f
1 changed files with 22 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

27
src/util/fairland.c
View file

@ -407,26 +407,43 @@ parse_args(int argc, char *argv[])
ni = atoi(argv[2]); ni = atoi(argv[2]);
else else
ni = nc; ni = nc;
if (ni < 0) {
fprintf(stderr, "%s: number of islands must be >= 0\n",
program_name);
exit(1);
}
if (argc > 3) if (argc > 3)
is = atoi(argv[3]); is = atoi(argv[3]);
else else
is = sc / 2; is = sc / 2;
if (is < 1) if (is < 1) {
is = 1; fprintf(stderr, "%s: size of islands must be > 0\n",
program_name);
exit(1);
}
if (argc > 4) if (argc > 4)
sp = atoi(argv[4]); sp = atoi(argv[4]);
else else
sp = DEFAULT_SPIKE; sp = DEFAULT_SPIKE;
sp = LIMIT_TO(sp, 0, 100); if (sp < 0 || sp > 100) {
fprintf(stderr,
"%s: spike percentage must be between 0 and 100\n",
program_name);
exit(1);
}
if (argc > 5) if (argc > 5)
pm = atoi(argv[5]); pm = atoi(argv[5]);
else else
pm = DEFAULT_MOUNTAIN; pm = DEFAULT_MOUNTAIN;
if (pm < 0) if (pm < 0 || pm > 100) {
pm = 0; fprintf(stderr,
"%s: mountain percentage must be between 0 and 100\n",
program_name);
exit(1);
}
if (argc > 6) if (argc > 6)
di = atoi(argv[6]); di = atoi(argv[6]);