Merge branch 'ab/free-and-null'
A common pattern to free a piece of memory and assign NULL to the pointer that used to point at it has been replaced with a new FREE_AND_NULL() macro. * ab/free-and-null: *.[ch] refactoring: make use of the FREE_AND_NULL() macro coccinelle: make use of the "expression" FREE_AND_NULL() rule coccinelle: add a rule to make "expression" code use FREE_AND_NULL() coccinelle: make use of the "type" FREE_AND_NULL() rule coccinelle: add a rule to make "type" code use FREE_AND_NULL() git-compat-util: add a FREE_AND_NULL() wrapper around free(ptr); ptr = NULL
This commit is contained in:
@ -210,8 +210,7 @@ static int ll_ext_merge(const struct ll_merge_driver *fn,
|
||||
result->size = st.st_size;
|
||||
result->ptr = xmallocz(result->size);
|
||||
if (read_in_full(fd, result->ptr, result->size) != result->size) {
|
||||
free(result->ptr);
|
||||
result->ptr = NULL;
|
||||
FREE_AND_NULL(result->ptr);
|
||||
result->size = 0;
|
||||
}
|
||||
close_bad:
|
||||
|
||||
Reference in New Issue
Block a user