reftable/basics: fix segfault when growing names array fails
When growing the `names` array fails we would end up with a `NULL`
pointer. This causes two problems:
- We would run into a segfault because we try to free names that we
have assigned to the array already.
- We lose track of the old array and cannot free its contents.
Fix this issue by using a temporary variable. Like this we do not
clobber the old array that we tried to reallocate, which will remain
valid when a call to realloc(3P) fails.
Signed-off-by: Patrick Steinhardt <ps@pks.im>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
committed by
Junio C Hamano
parent
35730302e9
commit
2179b5c831
@ -152,9 +152,11 @@ char **parse_names(char *buf, int size)
|
|||||||
next = end;
|
next = end;
|
||||||
}
|
}
|
||||||
if (p < next) {
|
if (p < next) {
|
||||||
REFTABLE_ALLOC_GROW(names, names_len + 1, names_cap);
|
char **names_grown = names;
|
||||||
if (!names)
|
REFTABLE_ALLOC_GROW(names_grown, names_len + 1, names_cap);
|
||||||
|
if (!names_grown)
|
||||||
goto err;
|
goto err;
|
||||||
|
names = names_grown;
|
||||||
|
|
||||||
names[names_len] = reftable_strdup(p);
|
names[names_len] = reftable_strdup(p);
|
||||||
if (!names[names_len++])
|
if (!names[names_len++])
|
||||||
|
|||||||
Reference in New Issue
Block a user