summaryrefslogtreecommitdiff
path: root/merge-recursive.c
diff options
context:
space:
mode:
authorJohannes Schindelin <johannes.schindelin@gmx.de>2024-02-28 09:44:07 +0000
committerJunio C Hamano <gitster@pobox.com>2024-02-28 09:47:03 -0800
commite67431d4965d13b185db3ddb4445c3c7034ca62d (patch)
tree7848fce72ce93afe70eddfb562753891b2164125 /merge-recursive.c
parentf41f85c9ec8d4d46de0fd5fded88db94d3ec8c11 (diff)
commit-reach(paint_down_to_common): plug two memory leaks
When a commit is missing, we return early (currently pretending that no merge basis could be found in that case). At that stage, it is possible that a merge base could have been found already, and added to the `result`, which is now leaked. The priority queue has a similar issue: There might still be a commit in that queue. Let's release both, to address the potential memory leaks. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'merge-recursive.c')
0 files changed, 0 insertions, 0 deletions