undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

attr: fix segfault in gitattributes parsing code

Browse Source 
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>
This commit is contained in:
Steffen Prohaska 2007-10-18 22:02:35 +02:00 committed by Shawn O. Pearce
parent 415e7b877c
commit d7b0a09316
2 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
attr.c
View File

@ -214,8 +214,11 @@ static struct match_attr *parse_attr_line(const char *line, const char *src,
num_attr = 0; num_attr = 0;
cp = name + namelen; cp = name + namelen;
cp = cp + strspn(cp, blank); cp = cp + strspn(cp, blank);
while (*cp) while (*cp) {
cp = parse_attr(src, lineno, cp, &num_attr, res); cp = parse_attr(src, lineno, cp, &num_attr, res);
if (!cp)
return NULL;
}
if (pass) if (pass)
break; break;
res = xcalloc(1, res = xcalloc(1,

7
t/t0020-crlf.sh
View File

@ -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 test_done