Fix parsing numeric color values

Numeric color only worked if it was at end of line.
Noticed by Chris Larson <clarson@kergoth.com>.

Signed-off-by: Timo Hirvonen <tihirvon@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/color.c b/color.c
index 7f66c29fae57abceda30b1257c2a66626f3be0b2..cb70340420b6285786b988d4a98d2023a37d4ffc 100644 (file)
--- a/color.c
+++ b/color.c
@@ -17,7 +17,7 @@ static int parse_color(const char *name, int len)
                        return i - 1;
        }
        i = strtol(name, &end, 10);
-       if (*name && !*end && i >= -1 && i <= 255)
+       if (end - name == len && i >= -1 && i <= 255)
                return i;
        return -2;
 }

diff --git a/t/t4026-color.sh b/t/t4026-color.sh
new file mode 100755 (executable)
index 0000000..b61e516
--- /dev/null
+++ b/t/t4026-color.sh
@@ -0,0 +1,69 @@
+#!/bin/sh
+#
+# Copyright (c) 2008 Timo Hirvonen
+#
+
+test_description='Test diff/status color escape codes'
+. ./test-lib.sh
+
+color()
+{
+       git config diff.color.new "$1" &&
+       test "`git config --get-color diff.color.new`" = "\e$2"
+}
+
+invalid_color()
+{
+       git config diff.color.new "$1" &&
+       test -z "`git config --get-color diff.color.new 2>/dev/null`"
+}
+
+test_expect_success 'reset' '
+       color "reset" "[m"
+'
+
+test_expect_success 'attribute before color name' '
+       color "bold red" "[1;31m"
+'
+
+test_expect_success 'color name before attribute' '
+       color "red bold" "[1;31m"
+'
+
+test_expect_success 'attr fg bg' '
+       color "ul blue red" "[4;34;41m"
+'
+
+test_expect_success 'fg attr bg' '
+       color "blue ul red" "[4;34;41m"
+'
+
+test_expect_success 'fg bg attr' '
+       color "blue red ul" "[4;34;41m"
+'
+
+test_expect_success '256 colors' '
+       color "254 bold 255" "[1;38;5;254;48;5;255m"
+'
+
+test_expect_success 'color too small' '
+       invalid_color "-2"
+'
+
+test_expect_success 'color too big' '
+       invalid_color "256"
+'
+
+test_expect_success 'extra character after color number' '
+       invalid_color "3X"
+'
+
+test_expect_success 'extra character after color name' '
+       invalid_color "redX"
+'
+
+test_expect_success 'extra character after attribute' '
+       invalid_color "dimX"
+'
+
+test_done