Merge branch 'maint' of git://repo.or.cz/git-gui into maint

[git.git] / attr.c

diff --git a/attr.c b/attr.c
index 129399310ae061a66527ce0b723cc0aeb30ef34c..6e82507be77b1881925fda7ead8c3a5432bf6576 100644 (file)
--- a/attr.c
+++ b/attr.c
@@ -214,8 +214,11 @@ static struct match_attr *parse_attr_line(const char *line, const char *src,
                num_attr = 0;
                cp = name + namelen;
                cp = cp + strspn(cp, blank);
-               while (*cp)
+               while (*cp) {
                        cp = parse_attr(src, lineno, cp, &num_attr, res);
+                       if (!cp)
+                               return NULL;
+               }
                if (pass)
                        break;
                res = xcalloc(1,