aboutsummaryrefslogtreecommitdiffstats
path: root/sway
diff options
context:
space:
mode:
authorLibravatar Mykyta Holubakha <hilobakho@gmail.com>2017-07-01 20:30:38 +0300
committerLibravatar Mykyta Holubakha <hilobakho@gmail.com>2017-07-01 21:36:17 +0300
commit7d8a84b58790454308bcac114d3f28a09c28928c (patch)
treeaf35993f88080f41b9e2dddb69a20d5152a088ed /sway
parentpermit.c: check for NULL pointer dereference (diff)
downloadsway-7d8a84b58790454308bcac114d3f28a09c28928c.tar.gz
sway-7d8a84b58790454308bcac114d3f28a09c28928c.tar.zst
sway-7d8a84b58790454308bcac114d3f28a09c28928c.zip
Do not add empty policies
Policy allocation failure is non-fatal
Diffstat (limited to 'sway')
-rw-r--r--sway/commands.c6
-rw-r--r--sway/security.c6
2 files changed, 6 insertions, 6 deletions
diff --git a/sway/commands.c b/sway/commands.c
index 14be656a..d55d9a96 100644
--- a/sway/commands.c
+++ b/sway/commands.c
@@ -608,10 +608,10 @@ struct cmd_results *config_commands_command(char *exec) {
608 } 608 }
609 if (!policy) { 609 if (!policy) {
610 policy = alloc_command_policy(cmd); 610 policy = alloc_command_policy(cmd);
611 if (!policy) { 611 sway_assert(policy, "Unable to allocate security policy");
612 sway_abort("Unable to allocate security policy"); 612 if (policy) {
613 list_add(config->command_policies, policy);
613 } 614 }
614 list_add(config->command_policies, policy);
615 } 615 }
616 policy->context = context; 616 policy->context = context;
617 617
diff --git a/sway/security.c b/sway/security.c
index 92de06c1..fcd70f9d 100644
--- a/sway/security.c
+++ b/sway/security.c
@@ -152,10 +152,10 @@ struct feature_policy *get_feature_policy(const char *name) {
152 } 152 }
153 if (!policy) { 153 if (!policy) {
154 policy = alloc_feature_policy(name); 154 policy = alloc_feature_policy(name);
155 if (!policy) { 155 sway_assert(policy, "Unable to allocate security policy");
156 sway_abort("Unable to allocate security policy"); 156 if (policy) {
157 list_add(config->feature_policies, policy);
157 } 158 }
158 list_add(config->feature_policies, policy);
159 } 159 }
160 return policy; 160 return policy;
161} 161}