config: require at least one digit when parsing numbers

If the input to strtoimax() or strtoumax() does not contain any digits
then they return zero and set `end` to point to the start of the input
string.  git_parse_[un]signed() do not check `end` and so fail to return
an error and instead return a value of zero if the input string is a
valid units factor without any digits (e.g "k").

Tests are added to check that 'git config --int' and OPT_MAGNITUDE()
reject a units specifier without a leading digit.

Helped-by: Jeff King <peff@peff.net>
Signed-off-by: Phillip Wood <phillip.wood@dunelm.org.uk>
Signed-off-by: Taylor Blau <me@ttaylorr.com>

diff --git a/config.c b/config.c
index d5069d4f01dc8cb63e1db7f9ed4a220eeb6447e1..b7fb68026d84088da49cb42797cece8d23f4b535 100644 (file)
--- a/config.c
+++ b/config.c
@@ -1167,6 +1167,10 @@ static int git_parse_signed(const char *value, intmax_t *ret, intmax_t max)
                val = strtoimax(value, &end, 0);
                if (errno == ERANGE)
                        return 0;
+               if (end == value) {
+                       errno = EINVAL;
+                       return 0;
+               }
                factor = get_unit_factor(end);
                if (!factor) {
                        errno = EINVAL;
@@ -1202,6 +1206,10 @@ static int git_parse_unsigned(const char *value, uintmax_t *ret, uintmax_t max)
                val = strtoumax(value, &end, 0);
                if (errno == ERANGE)
                        return 0;
+               if (end == value) {
+                       errno = EINVAL;
+                       return 0;
+               }
                factor = get_unit_factor(end);
                if (!factor) {
                        errno = EINVAL;

diff --git a/t/t0040-parse-options.sh b/t/t0040-parse-options.sh
index 64d2327b744874d1df582ff093aac6269c0160d7..7d7ecfd57162cf9cde2e74007a6323c635a3b2a9 100755 (executable)
--- a/t/t0040-parse-options.sh
+++ b/t/t0040-parse-options.sh
@@ -714,4 +714,11 @@ test_expect_success 'negative magnitude' '
        grep "non-negative integer" err &&
        test_must_be_empty out
 '
+
+test_expect_success 'magnitude with units but no numbers' '
+       test_must_fail test-tool parse-options --magnitude m >out 2>err &&
+       grep "non-negative integer" err &&
+       test_must_be_empty out
+'
+
 test_done

diff --git a/t/t1300-config.sh b/t/t1300-config.sh
index c6661e61af55219b73a20262aad5106bf203c3e2..2575279ab84e8a32239a7ea30f72022d3ff6b9f8 100755 (executable)
--- a/t/t1300-config.sh
+++ b/t/t1300-config.sh
@@ -2228,6 +2228,12 @@ test_expect_success '--type rejects unknown specifiers' '
        test_i18ngrep "unrecognized --type argument" error
 '
 
+test_expect_success '--type=int requires at least one digit' '
+       test_must_fail git config --type int --default m some.key >out 2>error &&
+       grep "bad numeric config value" error &&
+       test_must_be_empty out
+'
+
 test_expect_success '--replace-all does not invent newlines' '
        q_to_tab >.git/config <<-\EOF &&
        [abc]key