From 6ac6549251885a9b413676b116a696a2599b410c Mon Sep 17 00:00:00 2001 From: Yu Watanabe Date: Sun, 9 May 2021 14:33:20 +0900 Subject: [PATCH] userdb: shorten code a bit Hopefully fixes CID#1452937. --- src/userdb/userwork.c | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/src/userdb/userwork.c b/src/userdb/userwork.c index 71251ccf1d1..418a2892acf 100644 --- a/src/userdb/userwork.c +++ b/src/userdb/userwork.c @@ -393,13 +393,10 @@ static int vl_method_get_memberships(Varlink *link, JsonVariant *parameters, Var JSON_BUILD_PAIR("groupName", JSON_BUILD_STRING(last_group_name)))); if (r < 0) return r; - - free(last_user_name); - free(last_group_name); } - last_user_name = TAKE_PTR(user_name); - last_group_name = TAKE_PTR(group_name); + free_and_replace(last_user_name, user_name); + free_and_replace(last_group_name, group_name); } if (!last_user_name) { -- 2.47.3