apply.c: fix -p argument parsing
"git apply" has an option -p that takes an integer as its argument. Unfortunately the function apply_option_parse_p() in charge of parsing this argument uses atoi() to convert from string to integer, which allows a non-digit after the number (e.g. "1q") to be silently ignored. As a consequence, an argument that does not begin with a digit silently becomes a zero. Despite this command working fine when a non-positive argument is passed, it might be useful for the end user to know that their input contains non-digits that might've been unintended. Replace atoi() with strtol_i() to catch malformed inputs. Signed-off-by: Mirko Faina <mroik@delayed.space> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Mirko Faina committed
Mar 16, 2026 at 01:51 UTC
d05d84c5f507e8b973982e9cf3a27a07cd94fcb8
2 files changed
+43
-1
apply.c
+2
-1
@@ -4961,7 +4961,8 @@ static int apply_option_parse_p(const struct option *opt,
4961
4962
BUG_ON_OPT_NEG(unset);
4963
4964
- state->p_value = atoi(arg);
4964
+ if (strtol_i(arg, 10, &state->p_value) < 0 || state->p_value < 0)
4965
+ die(_("option -p expects a non-negative integer, got '%s'"), arg);
4966
state->p_value_known = 1;
4967
return 0;
4968
}
t/t4120-apply-popt.sh
+41
@@ -23,6 +23,47 @@ test_expect_success setup '
23
rmdir süb
24
'
25
26
+test_expect_success 'git apply -p 1 patch' '
27
+ cat >patch <<-\EOF &&
28
+ From 90ad11d5b2d437e82d4d992f72fb44c2227798b5 Mon Sep 17 00:00:00 2001
29
+ From: Mroik <mroik@delayed.space>
30
+ Date: Mon, 9 Mar 2026 23:25:00 +0100
31
+ Subject: [PATCH] Test
32
+
33
+ ---
34
+ t/test/test | 0
35
+ 1 file changed, 0 insertions(+), 0 deletions(-)
36
+ create mode 100644 t/test/test
37
+
38
+ diff --git a/t/test/test b/t/test/test
39
+ new file mode 100644
40
+ index 0000000000..e69de29bb2
41
+ --
42
+ 2.53.0.851.ga537e3e6e9
43
+ EOF
44
+ test_when_finished "rm -rf t" &&
45
+ git apply -p 1 patch &&
46
+ test_path_is_dir t
47
+'
48
+
49
+test_expect_success 'apply fails due to non-num -p' '
50
+ test_when_finished "rm -rf t test err" &&
51
+ test_must_fail git apply -p malformed patch 2>err &&
52
+ test_grep "option -p expects a non-negative integer" err
53
+'
54
+
55
+test_expect_success 'apply fails due to trailing non-digit in -p' '
56
+ test_when_finished "rm -rf t test err" &&
57
+ test_must_fail git apply -p 2q patch 2>err &&
58
+ test_grep "option -p expects a non-negative integer" err
59
+'
60
+
61
+test_expect_success 'apply fails due to negative number in -p' '
62
+ test_when_finished "rm -rf t test err patch" &&
63
+ test_must_fail git apply -p -1 patch 2> err &&
64
+ test_grep "option -p expects a non-negative integer" err
65
+'
66
+
67
test_expect_success 'apply git diff with -p2' '
68
cp file1.saved file1 &&
69
git apply -p2 patch.file