SymbX/systemd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

core: free the strings in the set in other places too

Browse Source 
Follow-up for #28551.
This commit is contained in:
David Tardon
2023-08-01 20:53:19 +09:00
committed by Yu Watanabe
parent 6840ee10e4
commit 1a572fd08f
4 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/core/dbus-cgroup.c
+1 -1
View File
@@ -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;
src/core/dbus-execute.c
+4 -4
View File
@@ -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);
}
src/core/load-fragment.c
+5 -5
View File
@@ -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;
}
src/journal/journald-context.c
+2 -2
View File
@@ -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) {