From 7d8a84b58790454308bcac114d3f28a09c28928c Mon Sep 17 00:00:00 2001
From: Mykyta Holubakha <hilobakho@gmail.com>
Date: Sat, 1 Jul 2017 20:30:38 +0300
Subject: Do not add empty policies
Policy allocation failure is non-fatal
---
sway/commands.c | 6 +++---
sway/security.c | 6 +++---
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) {
}
if (!policy) {
policy = alloc_command_policy(cmd);
- if (!policy) {
- sway_abort("Unable to allocate security policy");
+ sway_assert(policy, "Unable to allocate security policy");
+ if (policy) {
+ list_add(config->command_policies, policy);
}
- list_add(config->command_policies, policy);
}
policy->context = context;
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) {
}
if (!policy) {
policy = alloc_feature_policy(name);
- if (!policy) {
- sway_abort("Unable to allocate security policy");
+ sway_assert(policy, "Unable to allocate security policy");
+ if (policy) {
+ list_add(config->feature_policies, policy);
}
- list_add(config->feature_policies, policy);
}
return policy;
}
--
cgit v1.2.3