From: Mike Yuan <me@yhndnzj.com>
Date: Thu, 25 Jan 2024 09:29:50 +0000 (+0800)
Subject: logind-user: don't clear individual fields if object is freed anyway
X-Git-Tag: v256-rc1~1043^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=74e75a05cf060e11ff4e0895cdf64c9a1f9c67f3;p=thirdparty%2Fsystemd.git

logind-user: don't clear individual fields if object is freed anyway
---

diff --git a/src/login/logind-user.c b/src/login/logind-user.c
index 1372fb50332..10b8be22334 100644
--- a/src/login/logind-user.c
+++ b/src/login/logind-user.c
@@ -116,25 +116,25 @@ User *user_free(User *u) {
                 session_free(u->sessions);
 
         if (u->service)
-                hashmap_remove_value(u->manager->user_units, u->service, u);
+                (void) hashmap_remove_value(u->manager->user_units, u->service, u);
 
         if (u->runtime_dir_service)
-                hashmap_remove_value(u->manager->user_units, u->runtime_dir_service, u);
+                (void) hashmap_remove_value(u->manager->user_units, u->runtime_dir_service, u);
 
         if (u->slice)
-                hashmap_remove_value(u->manager->user_units, u->slice, u);
+                (void) hashmap_remove_value(u->manager->user_units, u->slice, u);
 
-        hashmap_remove_value(u->manager->users, UID_TO_PTR(u->user_record->uid), u);
+        (void) hashmap_remove_value(u->manager->users, UID_TO_PTR(u->user_record->uid), u);
 
         sd_event_source_unref(u->timer_event_source);
 
-        u->service_job = mfree(u->service_job);
+        free(u->service_job);
 
-        u->service = mfree(u->service);
-        u->runtime_dir_service = mfree(u->runtime_dir_service);
-        u->slice = mfree(u->slice);
-        u->runtime_path = mfree(u->runtime_path);
-        u->state_file = mfree(u->state_file);
+        free(u->service);
+        free(u->runtime_dir_service);
+        free(u->slice);
+        free(u->runtime_path);
+        free(u->state_file);
 
         user_record_unref(u->user_record);