Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.kernel.org/pub/scm/git/git.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'll-merge.c')
-rw-r--r--ll-merge.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/ll-merge.c b/ll-merge.c
index b9576efe97..9fb855a900 100644
--- a/ll-merge.c
+++ b/ll-merge.c
@@ -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: