From ded83936106a94f854873e949fa7928dce8dbdd1 Mon Sep 17 00:00:00 2001 From: Michael Haggerty Date: Thu, 7 Apr 2016 15:03:08 -0400 Subject: [PATCH] check_aliased_update(): check that dst_name is non-NULL If there is an error in resolve_ref_unsafe(), it returns NULL. We check for this case, but not until after calling strip_namespace(). Instead, call strip_namespace() *after* the NULL check. Signed-off-by: Michael Haggerty Signed-off-by: David Turner Signed-off-by: Junio C Hamano --- builtin/receive-pack.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/builtin/receive-pack.c b/builtin/receive-pack.c index c8e32b297..49cc88d72 100644 --- a/builtin/receive-pack.c +++ b/builtin/receive-pack.c @@ -1081,13 +1081,13 @@ static void check_aliased_update(struct command *cmd, struct string_list *list) if (!(flag & REF_ISSYMREF)) return; - dst_name = strip_namespace(dst_name); if (!dst_name) { rp_error("refusing update to broken symref '%s'", cmd->ref_name); cmd->skip_update = 1; cmd->error_string = "broken symref"; return; } + dst_name = strip_namespace(dst_name); if ((item = string_list_lookup(list, dst_name)) == NULL) return; -- 2.11.0