vis-menu: do not segfault if an option lacks an argument

mikaoP · May 21, 2016 · 2931a5e · 2931a5e
1 parent 0e80bee
commit 2931a5e
Showing 1 changed file with 16 additions and 4 deletions.
diff --git a/vis-menu.c b/vis-menu.c
@@ -594,10 +594,22 @@ main(int argc, char **argv) {
 		else if(!strcmp(argv[i], "-b"))
 			barpos=-1;
 		/* double flags */
-		else if(!strcmp(argv[i], "-p"))
-			prompt=argv[++i];
-		else if(!strcmp(argv[i], "-l"))
-			lines = atoi(argv[++i]);
+		else if(!strcmp(argv[i], "-p")) {
+			if(argc > i+1)
+				prompt=argv[++i];
+			else {
+				fprintf(stderr, "Must provide a prompt\n");
+				exit(EXIT_FAILURE);
+			}
+		}
+		else if(!strcmp(argv[i], "-l")) {
+			if(argc > i+1)
+				lines = atoi(argv[++i]);
+			else {
+				fprintf(stderr, "Must provide a line count\n");
+				exit(EXIT_FAILURE);
+			}
+		}
 		else {
 			strncpy(text, argv[i], sizeof(text)-1);
 			cursor = strlen(text);