Merge branch 'mf/apply-p-no-atoi'

gitster · gitster · commit cb77c3a6a7f5 · 2026-03-27T11:00:02.000-07:00
"git apply -p&lt;n&gt;" parses &lt;n&gt; more carefully now.

* mf/apply-p-no-atoi:
  apply.c: fix -p argument parsing
diff --git a/apply.c b/apply.c
@@ -4981,7 +4981,8 @@ static int apply_option_parse_p(const struct option *opt,
 
 	BUG_ON_OPT_NEG(unset);
 
-	state->p_value = atoi(arg);
+	if (strtol_i(arg, 10, &state->p_value) < 0 || state->p_value < 0)
+		die(_("option -p expects a non-negative integer, got '%s'"), arg);
 	state->p_value_known = 1;
 	return 0;
 }
diff --git a/t/t4120-apply-popt.sh b/t/t4120-apply-popt.sh
@@ -23,6 +23,47 @@ test_expect_success setup '
 	rmdir süb
 '
 
+test_expect_success 'git apply -p 1 patch' '
+	cat >patch <<-\EOF &&
+	From 90ad11d5b2d437e82d4d992f72fb44c2227798b5 Mon Sep 17 00:00:00 2001
+	From: Mroik <mroik@delayed.space>
+	Date: Mon, 9 Mar 2026 23:25:00 +0100
+	Subject: [PATCH] Test
+
+	---
+	 t/test/test | 0
+	 1 file changed, 0 insertions(+), 0 deletions(-)
+	 create mode 100644 t/test/test
+
+	diff --git a/t/test/test b/t/test/test
+	new file mode 100644
+	index 0000000000..e69de29bb2
+	--
+	2.53.0.851.ga537e3e6e9
+	EOF
+	test_when_finished "rm -rf t" &&
+	git apply -p 1 patch &&
+	test_path_is_dir t
+'
+
+test_expect_success 'apply fails due to non-num -p' '
+	test_when_finished "rm -rf t test err" &&
+	test_must_fail git apply -p malformed patch 2>err &&
+	test_grep "option -p expects a non-negative integer" err
+'
+
+test_expect_success 'apply fails due to trailing non-digit in -p' '
+	test_when_finished "rm -rf t test err" &&
+	test_must_fail git apply -p 2q patch 2>err &&
+	test_grep "option -p expects a non-negative integer" err
+'
+
+test_expect_success 'apply fails due to negative number in -p' '
+	test_when_finished "rm -rf t test err patch" &&
+	test_must_fail git apply -p -1 patch 2> err &&
+	test_grep "option -p expects a non-negative integer" err
+'
+
 test_expect_success 'apply git diff with -p2' '
 	cp file1.saved file1 &&
 	git apply -p2 patch.file

Original file line number	Diff line number	Diff line change
`@@ -4981,7 +4981,8 @@ static int apply_option_parse_p(const struct option *opt,`
`4981`	`4981`
`4982`	`4982`	`BUG_ON_OPT_NEG(unset);`
`4983`	`4983`
`4984`		`- state->p_value = atoi(arg);`
	`4984`	`+ if (strtol_i(arg, 10, &state->p_value) < 0 \|\| state->p_value < 0)`
	`4985`	`+ die(_("option -p expects a non-negative integer, got '%s'"), arg);`
`4985`	`4986`	`state->p_value_known = 1;`
`4986`	`4987`	`return 0;`
`4987`	`4988`	`}`