kernel
/
git
mirror of https://git.kernel.org/pub/scm/git/git.git
1
0
Fork 0
Code Releases Activity

Fix crash in t0020 (crlf conversion) 

Reallocated wrong size.
Noticed on Ubuntu 7.04 probably because it has some malloc diagnostics in libc:
"git-read-tree --reset -u HEAD" aborted in the test. Valgrind sped up the
debugging greatly: took me 10 minutes.

Signed-off-by: Alex Riesen <raa.lkml@gmail.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>
maint
Alex Riesen 2007-04-22 16:11:54 +02:00 committed by Junio C Hamano
parent 67e22ed58f
commit 4629795816
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
attr.c
View File

@ -300,7 +300,8 @@ static struct attr_stack *read_attr_from_array(const char **list)
a = parse_attr_line(line, "[builtin]", ++lineno, 1); a = parse_attr_line(line, "[builtin]", ++lineno, 1);
if (!a) if (!a)
continue; continue;
res->attrs = xrealloc(res->attrs, res->num_matches + 1); res->attrs = xrealloc(res->attrs,
sizeof(struct match_attr *) * (res->num_matches + 1));
res->attrs[res->num_matches++] = a; res->attrs[res->num_matches++] = a;
} }
return res; return res;
@ -324,7 +325,8 @@ static struct attr_stack *read_attr_from_file(const char *path, int macro_ok)
a = parse_attr_line(buf, path, ++lineno, macro_ok); a = parse_attr_line(buf, path, ++lineno, macro_ok);
if (!a) if (!a)
continue; continue;
res->attrs = xrealloc(res->attrs, res->num_matches + 1); res->attrs = xrealloc(res->attrs,
sizeof(struct match_attr *) * (res->num_matches + 1));
res->attrs[res->num_matches++] = a; res->attrs[res->num_matches++] = a;
} }
fclose(fp); fclose(fp);