From: Yu Watanabe <watanabe.yu+github@gmail.com>
Date: Sun, 9 May 2021 05:33:20 +0000 (+0900)
Subject: userdb: shorten code a bit
X-Git-Tag: v249-rc1~265^2~1
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=6ac6549251885a9b413676b116a696a2599b410c;p=thirdparty%2Fsystemd.git

userdb: shorten code a bit

Hopefully fixes CID#1452937.
---

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) {