summaryrefslogtreecommitdiff
path: root/attr.c
diff options
context:
space:
mode:
authorShawn O. Pearce <spearce@spearce.org>2007-10-19 05:18:55 (GMT)
committerShawn O. Pearce <spearce@spearce.org>2007-10-19 05:18:55 (GMT)
commitf5bf6feb05b8c89c448ded6e6fad0eb58ef35463 (patch)
tree9f166b46e5005a38d0aeb59a9b4880b508578688 /attr.c
parentd7e56dbc4f60f6bd238e8612783541d89f006fb7 (diff)
parentbbaf63f2f18242484868d6c03d5df9bd071d6deb (diff)
downloadgit-f5bf6feb05b8c89c448ded6e6fad0eb58ef35463.zip
git-f5bf6feb05b8c89c448ded6e6fad0eb58ef35463.tar.gz
git-f5bf6feb05b8c89c448ded6e6fad0eb58ef35463.tar.bz2
Merge branch 'maint'
* maint: Further 1.5.3.5 fixes described in release notes Avoid invoking diff drivers during git-stash attr: fix segfault in gitattributes parsing code Define NI_MAXSERV if not defined by operating system Ensure we add directories in the correct order Avoid scary errors about tagged trees/blobs during git-fetch
Diffstat (limited to 'attr.c')
-rw-r--r--attr.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/attr.c b/attr.c
index 92704a3..741db3b 100644
--- a/attr.c
+++ b/attr.c
@@ -209,8 +209,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,