From 1a572fd08ff4a01f77d3b8c8465a559971c77466 Mon Sep 17 00:00:00 2001
From: David Tardon <dtardon@redhat.com>
Date: Tue, 1 Aug 2023 10:44:06 +0200
Subject: [PATCH] core: free the strings in the set in other places too

Follow-up for #28551.
---
 src/core/dbus-cgroup.c         |  2 +-
 src/core/dbus-execute.c        |  8 ++++----
 src/core/load-fragment.c       | 10 +++++-----
 src/journal/journald-context.c |  4 ++--
 4 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/src/core/dbus-cgroup.c b/src/core/dbus-cgroup.c
index 9ab806b22d7..5347525844e 100644
--- a/src/core/dbus-cgroup.c
+++ b/src/core/dbus-cgroup.c
@@ -2159,7 +2159,7 @@ int bus_cgroup_set_property(
 
                         if (strv_isempty(l)) {
                                 c->restrict_network_interfaces_is_allow_list = false;
-                                c->restrict_network_interfaces = set_free(c->restrict_network_interfaces);
+                                c->restrict_network_interfaces = set_free_free(c->restrict_network_interfaces);
 
                                 unit_write_settingf(u, flags, name, "%s=", name);
                                 return 1;
diff --git a/src/core/dbus-execute.c b/src/core/dbus-execute.c
index c3255398c6f..52964390ae8 100644
--- a/src/core/dbus-execute.c
+++ b/src/core/dbus-execute.c
@@ -1915,8 +1915,8 @@ int bus_exec_context_set_transient_property(
 
                 if (!UNIT_WRITE_FLAGS_NOOP(flags)) {
                         if (strv_isempty(allow_list) && strv_isempty(deny_list)) {
-                                c->log_filter_allowed_patterns = set_free(c->log_filter_allowed_patterns);
-                                c->log_filter_denied_patterns = set_free(c->log_filter_denied_patterns);
+                                c->log_filter_allowed_patterns = set_free_free(c->log_filter_allowed_patterns);
+                                c->log_filter_denied_patterns = set_free_free(c->log_filter_denied_patterns);
                                 unit_write_settingf(u, flags, name, "%s=", name);
                         } else {
                                 r = set_put_strdupv(&c->log_filter_allowed_patterns, allow_list);
@@ -2124,7 +2124,7 @@ int bus_exec_context_set_transient_property(
 
                         if (strv_isempty(l)) {
                                 c->restrict_filesystems_allow_list = false;
-                                c->restrict_filesystems = set_free(c->restrict_filesystems);
+                                c->restrict_filesystems = set_free_free(c->restrict_filesystems);
 
                                 unit_write_setting(u, flags, name, "RestrictFileSystems=");
                                 return 1;
@@ -2374,7 +2374,7 @@ int bus_exec_context_set_transient_property(
                         return r;
 
                 if (!UNIT_WRITE_FLAGS_NOOP(flags) && isempty) {
-                        c->import_credentials = set_free(c->import_credentials);
+                        c->import_credentials = set_free_free(c->import_credentials);
                         (void) unit_write_settingf(u, flags, name, "%s=", name);
                 }
 
diff --git a/src/core/load-fragment.c b/src/core/load-fragment.c
index c69d47c2284..219a84a234d 100644
--- a/src/core/load-fragment.c
+++ b/src/core/load-fragment.c
@@ -3664,7 +3664,7 @@ int config_parse_restrict_filesystems(
 
         if (isempty(rvalue)) {
                 /* Empty assignment resets the list */
-                c->restrict_filesystems = set_free(c->restrict_filesystems);
+                c->restrict_filesystems = set_free_free(c->restrict_filesystems);
                 c->restrict_filesystems_allow_list = false;
                 return 0;
         }
@@ -4977,7 +4977,7 @@ int config_parse_import_credential(
 
         if (isempty(rvalue)) {
                 /* Empty assignment resets the list */
-                *import_credentials = set_free(*import_credentials);
+                *import_credentials = set_free_free(*import_credentials);
                 return 0;
         }
 
@@ -6053,7 +6053,7 @@ int config_parse_restrict_network_interfaces(
 
         if (isempty(rvalue)) {
                 /* Empty assignment resets the list */
-                c->restrict_network_interfaces = set_free(c->restrict_network_interfaces);
+                c->restrict_network_interfaces = set_free_free(c->restrict_network_interfaces);
                 return 0;
         }
 
@@ -6647,8 +6647,8 @@ int config_parse_log_filter_patterns(
 
         if (isempty(pattern)) {
                 /* Empty assignment resets the lists. */
-                c->log_filter_allowed_patterns = set_free(c->log_filter_allowed_patterns);
-                c->log_filter_denied_patterns = set_free(c->log_filter_denied_patterns);
+                c->log_filter_allowed_patterns = set_free_free(c->log_filter_allowed_patterns);
+                c->log_filter_denied_patterns = set_free_free(c->log_filter_denied_patterns);
                 return 0;
         }
 
diff --git a/src/journal/journald-context.c b/src/journal/journald-context.c
index 9a09d544533..7274f5f3e93 100644
--- a/src/journal/journald-context.c
+++ b/src/journal/journald-context.c
@@ -182,8 +182,8 @@ static void client_context_reset(Server *s, ClientContext *c) {
         c->log_ratelimit_interval = s->ratelimit_interval;
         c->log_ratelimit_burst = s->ratelimit_burst;
 
-        c->log_filter_allowed_patterns = set_free(c->log_filter_allowed_patterns);
-        c->log_filter_denied_patterns = set_free(c->log_filter_denied_patterns);
+        c->log_filter_allowed_patterns = set_free_free(c->log_filter_allowed_patterns);
+        c->log_filter_denied_patterns = set_free_free(c->log_filter_denied_patterns);
 }
 
 static ClientContext* client_context_free(Server *s, ClientContext *c) {
-- 
2.47.3