[RFC PATCH 06/15] ref-filter.c: BUG() out on show_ref() with NULL refname
- From
Ævar Arnfjörð Bjarmason <avarab@gmail.com>
- Date
- Jun 3, 2022, 18:37 UTC
- Message-ID
- <RFC-patch-06.15-2d04035d7aa-20220603T183608Z-avarab@gmail.com>
- In-Reply-To
- <RFC-cover-00.15-00000000000-20220603T183608Z-avarab@gmail.com>
Adjust code originally added in 5339bdad96a (ref-filter: introduce remote_ref_atom_parser(), 2016-02-17) to BUG() out rather than potentially segfault if we get a NULL refname here.
As noted by GCC v12's -fanalyzer that will happen if this follows the "refname = NULL" branch added in cc72385fe35 (for-each-ref: let upstream/push optionally report the remote name, 2017-10-05).
Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com> --- ref-filter.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/ref-filter.c b/ref-filter.c index 2413f889f48..91aa8e89268 100644 --- a/ref-filter.c +++ b/ref-filter.c @@ -1644,7 +1644,9 @@ static void fill_remote_ref_details(struct used_atom *atom, const char *refname, struct branch *branch, const char **s) { int num_ours, num_theirs; - if (atom->u.remote_ref.option == RR_REF) + if (atom->u.remote_ref.option == RR_REF && !refname) + BUG("must get refname with [...]remote_ref.option == RR_REF"); + else if (atom->u.remote_ref.option == RR_REF) *s = show_ref(&atom->u.remote_ref.refname, refname); else if (atom->u.remote_ref.option == RR_TRACK) { if (stat_tracking_info(branch, &num_ours, &num_theirs,
-- 2.36.1.1124.g577fa9c2ebd