aboutsummaryrefslogtreecommitdiff
path: root/sway/commands
diff options
context:
space:
mode:
authorDrew DeVault <sir@cmpwn.com>2017-07-01 14:46:21 -0400
committerGitHub <noreply@github.com>2017-07-01 14:46:21 -0400
commitf745a3b3ef0b575d9a3ea802c338a003b0cc6af5 (patch)
treeaf35993f88080f41b9e2dddb69a20d5152a088ed /sway/commands
parentfe763991d4865bffaafcd3ff15ecede6a9daa6ae (diff)
parent7d8a84b58790454308bcac114d3f28a09c28928c (diff)
Merge pull request #1255 from Hummer12007/policy
Prevent null pointer dereferences with policy allocation failure
Diffstat (limited to 'sway/commands')
-rw-r--r--sway/commands/permit.c6
1 files changed, 3 insertions, 3 deletions
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);