]> Kevux Git Server - rit/commit
builtin/merge: fix leaking `struct cmdnames` in `get_strategy()`
authorPatrick Steinhardt <ps@pks.im>
Tue, 11 Jun 2024 09:21:06 +0000 (11:21 +0200)
committerJunio C Hamano <gitster@pobox.com>
Tue, 11 Jun 2024 20:15:07 +0000 (13:15 -0700)
commit77241a6b5e3aadbc697632600e7e187ae94c4ca6
treef0dec6279a729166fdaa409b0c4145f1358a9dc2
parent6e95f4ee0394b7ed8ee42b5d0d22d35b20af16a9
builtin/merge: fix leaking `struct cmdnames` in `get_strategy()`

In "builtin/merge.c" we use the helper infrastructure to figure out what
merge strategies there are. We never free contents of the `cmdnames`
structures though and thus leak their memory.

Fix this by exposing the already existing `clean_cmdnames()` function to
release their memory. As this name isn't quite idiomatic, rename it to
`cmdnames_release()` while at it.

Signed-off-by: Patrick Steinhardt <ps@pks.im>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
builtin/merge.c
help.c
help.h
t/t7606-merge-custom.sh