зеркало из https://github.com/microsoft/git.git
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>
This commit is contained in:
Родитель
67e22ed58f
Коммит
4629795816
6
attr.c
6
attr.c
|
@ -300,7 +300,8 @@ static struct attr_stack *read_attr_from_array(const char **list)
|
|||
a = parse_attr_line(line, "[builtin]", ++lineno, 1);
|
||||
if (!a)
|
||||
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;
|
||||
}
|
||||
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);
|
||||
if (!a)
|
||||
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;
|
||||
}
|
||||
fclose(fp);
|
||||
|
|
Загрузка…
Ссылка в новой задаче