plug a few coverity-spotted leaks
Signed-off-by: Jim Meyering <meyering@redhat.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
parent
28eb1afec9
commit
dc4cd76710
@ -187,6 +187,8 @@ static int batch_one_object(const char *obj_name, int print_contents)
|
|||||||
if (type <= 0) {
|
if (type <= 0) {
|
||||||
printf("%s missing\n", obj_name);
|
printf("%s missing\n", obj_name);
|
||||||
fflush(stdout);
|
fflush(stdout);
|
||||||
|
if (print_contents == BATCH)
|
||||||
|
free(contents);
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -182,6 +182,7 @@ static int builtin_diff_combined(struct rev_info *revs,
|
|||||||
hashcpy((unsigned char *)(parent + i), ent[i].item->sha1);
|
hashcpy((unsigned char *)(parent + i), ent[i].item->sha1);
|
||||||
diff_tree_combined(parent[0], parent + 1, ents - 1,
|
diff_tree_combined(parent[0], parent + 1, ents - 1,
|
||||||
revs->dense_combined_merges, revs);
|
revs->dense_combined_merges, revs);
|
||||||
|
free(parent);
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -100,8 +100,10 @@ static int add_one_path(struct cache_entry *old, const char *path, int len, stru
|
|||||||
ce->ce_mode = ce_mode_from_stat(old, st->st_mode);
|
ce->ce_mode = ce_mode_from_stat(old, st->st_mode);
|
||||||
|
|
||||||
if (index_path(ce->sha1, path, st,
|
if (index_path(ce->sha1, path, st,
|
||||||
info_only ? 0 : HASH_WRITE_OBJECT))
|
info_only ? 0 : HASH_WRITE_OBJECT)) {
|
||||||
|
free(ce);
|
||||||
return -1;
|
return -1;
|
||||||
|
}
|
||||||
option = allow_add ? ADD_CACHE_OK_TO_ADD : 0;
|
option = allow_add ? ADD_CACHE_OK_TO_ADD : 0;
|
||||||
option |= allow_replace ? ADD_CACHE_OK_TO_REPLACE : 0;
|
option |= allow_replace ? ADD_CACHE_OK_TO_REPLACE : 0;
|
||||||
if (add_cache_entry(ce, option))
|
if (add_cache_entry(ce, option))
|
||||||
|
@ -811,19 +811,21 @@ static void parse_push(struct strbuf *buf)
|
|||||||
|
|
||||||
strbuf_reset(buf);
|
strbuf_reset(buf);
|
||||||
if (strbuf_getline(buf, stdin, '\n') == EOF)
|
if (strbuf_getline(buf, stdin, '\n') == EOF)
|
||||||
return;
|
goto free_specs;
|
||||||
if (!*buf->buf)
|
if (!*buf->buf)
|
||||||
break;
|
break;
|
||||||
} while (1);
|
} while (1);
|
||||||
|
|
||||||
if (push(nr_spec, specs))
|
if (push(nr_spec, specs))
|
||||||
exit(128); /* error already reported */
|
exit(128); /* error already reported */
|
||||||
for (i = 0; i < nr_spec; i++)
|
|
||||||
free(specs[i]);
|
|
||||||
free(specs);
|
|
||||||
|
|
||||||
printf("\n");
|
printf("\n");
|
||||||
fflush(stdout);
|
fflush(stdout);
|
||||||
|
|
||||||
|
free_specs:
|
||||||
|
for (i = 0; i < nr_spec; i++)
|
||||||
|
free(specs[i]);
|
||||||
|
free(specs);
|
||||||
}
|
}
|
||||||
|
|
||||||
int main(int argc, const char **argv)
|
int main(int argc, const char **argv)
|
||||||
|
Loading…
Reference in New Issue
Block a user