exec: Fix index overflow parsing -exec +

tavianator · Nov 11, 2022 · 712b137 · 712b137
1 parent 5ce883d
commit 712b137
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 1 deletion.
diff --git a/src/exec.c b/src/exec.c
@@ -173,7 +173,7 @@ struct bfs_exec *bfs_exec_parse(const struct bfs_ctx *ctx, char **argv, enum bfs
 			goto fail;
 		} else if (strcmp(arg, ";") == 0) {
 			break;
-		} else if (strcmp(arg, "+") == 0) {
+		} else if (execbuf->tmpl_argc > 0 && strcmp(arg, "+") == 0) {
 			const char *prev = execbuf->tmpl_argv[execbuf->tmpl_argc - 1];
 			if (!(execbuf->flags & BFS_EXEC_CONFIRM) && strcmp(prev, "{}") == 0) {
 				execbuf->flags |= BFS_EXEC_MULTI;

diff --git a/tests/posix/exec_plus_nothing.sh b/tests/posix/exec_plus_nothing.sh
@@ -0,0 +1,2 @@
+# Regression test: don't look OOB for {} +
+fail invoke_bfs basic -exec +
diff --git a/tests/posix/ok_plus_nothing.sh b/tests/posix/ok_plus_nothing.sh
@@ -0,0 +1,2 @@
+# Regression test: don't look OOB for {} +
+fail invoke_bfs basic -ok +
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		# Regression test: don't look OOB for {} +
		fail invoke_bfs basic -exec +
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		# Regression test: don't look OOB for {} +
		fail invoke_bfs basic -ok +