diff options
| author | Furkan Sahin <furkan-dev@proton.me> | 2017-07-01 14:46:21 -0400 |
|---|---|---|
| committer | Furkan Sahin <furkan-dev@proton.me> | 2017-07-01 14:46:21 -0400 |
| commit | 2f8513dbce9d0bbffe8007c20f3ad2a57b1b31c1 (patch) | |
| tree | af35993f88080f41b9e2dddb69a20d5152a088ed | |
| parent | 19827a78dbbfa9cfcb3639051b17853f41642de5 (diff) | |
| parent | 109b40f8762e309852585e42128ac0b8f2244480 (diff) | |
Merge pull request #1255 from Hummer12007/policy
Prevent null pointer dereferences with policy allocation failure
| -rw-r--r-- | sway/commands.c | 6 | ||||
| -rw-r--r-- | sway/commands/permit.c | 6 | ||||
| -rw-r--r-- | sway/security.c | 6 |
3 files changed, 9 insertions, 9 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/commands/permit.c b/sway/commands/permit.c index 66fa4e2a..7a5e06f7 100644 --- a/sway/commands/permit.c +++ b/sway/commands/permit.c @@ -65,11 +65,11 @@ struct cmd_results *cmd_permit(int argc, char **argv) { } struct feature_policy *policy = get_feature_policy(program); - if (assign_perms) { + if (policy && assign_perms) { policy->features |= get_features(argc, argv, &error); + sway_log(L_DEBUG, "Permissions granted to %s for features %d", + policy->program, policy->features); } - sway_log(L_DEBUG, "Permissions granted to %s for features %d", - policy->program, policy->features); free(program); return cmd_results_new(CMD_SUCCESS, NULL, NULL); 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; } |