@@ -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, attr.c @@ -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 t/t0020-crlf.sh 415e7b877c54440bf92137a7021416efdf0a29b5 Steffen Prohaska prohaska@zib.de http://github.com/schacon/git-source/commit/d7b0a09316fe8dcb62ad247dbbb45c3c777667ad d7b0a09316fe8dcb62ad247dbbb45c3c777667ad 2007-10-18T18:11:27-07:00 2007-10-18T13:02:35-07:00 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> a502781dd4cb2d46d3e4937263e61866ada2f66d Shawn O. Pearce spearce@spearce.org