summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSteffen Prohaska <prohaska@zib.de>2007-10-18 20:02:35 (GMT)
committerShawn O. Pearce <spearce@spearce.org>2007-10-19 01:11:27 (GMT)
commitd7b0a09316fe8dcb62ad247dbbb45c3c777667ad (patch)
treea502781dd4cb2d46d3e4937263e61866ada2f66d
parent415e7b877c54440bf92137a7021416efdf0a29b5 (diff)
downloadgit-d7b0a09316fe8dcb62ad247dbbb45c3c777667ad.zip
git-d7b0a09316fe8dcb62ad247dbbb45c3c777667ad.tar.gz
git-d7b0a09316fe8dcb62ad247dbbb45c3c777667ad.tar.bz2
attr: fix segfault in gitattributes parsing code
git may segfault if gitattributes contains an invalid entry. A test is added to t0020 that triggers the segfault. The parsing code is fixed to avoid the crash. Signed-off-by: Steffen Prohaska <prohaska@zib.de> Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
-rw-r--r--attr.c5
-rwxr-xr-xt/t0020-crlf.sh7
2 files changed, 11 insertions, 1 deletions
diff --git a/attr.c b/attr.c
index 1293993..6e82507 100644
--- 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,
diff --git a/t/t0020-crlf.sh b/t/t0020-crlf.sh
index 0807d9f..62bc4bb 100755
--- a/t/t0020-crlf.sh
+++ b/t/t0020-crlf.sh
@@ -371,4 +371,11 @@ test_expect_success 'in-tree .gitattributes (4)' '
}
'
+test_expect_success 'invalid .gitattributes (must not crash)' '
+
+ echo "three +crlf" >>.gitattributes &&
+ git diff
+
+'
+
test_done