alex/swayfx
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

Merge pull request #1255 from Hummer12007/policy

Browse source 
Prevent null pointer dereferences with policy allocation failure
This commit is contained in:
Drew DeVault 2017-07-01 14:46:21 -04:00 committed by GitHub
parent fe763991d4 7d8a84b587
commit f745a3b3ef
3 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
sway/commands.c
View file

@ -608,11 +608,11 @@ struct cmd_results *config_commands_command(char *exec) {
} }
if (!policy) { if (!policy) {
policy = alloc_command_policy(cmd); policy = alloc_command_policy(cmd);
if (!policy) { sway_assert(policy, "Unable to allocate security policy");
sway_abort("Unable to allocate security policy"); if (policy) {
}
list_add(config->command_policies, policy); list_add(config->command_policies, policy);
} }
}
policy->context = context; policy->context = context;
sway_log(L_INFO, "Set command policy for %s to %d", sway_log(L_INFO, "Set command policy for %s to %d",

4
sway/commands/permit.c
View file

@ -65,11 +65,11 @@ struct cmd_results *cmd_permit(int argc, char **argv) {
} }
struct feature_policy *policy = get_feature_policy(program); struct feature_policy *policy = get_feature_policy(program);
if (assign_perms) { if (policy && assign_perms) {
policy->features |= get_features(argc, argv, &error); policy->features |= get_features(argc, argv, &error);
}
sway_log(L_DEBUG, "Permissions granted to %s for features %d", sway_log(L_DEBUG, "Permissions granted to %s for features %d",
policy->program, policy->features); policy->program, policy->features);
}
free(program); free(program);
return cmd_results_new(CMD_SUCCESS, NULL, NULL); return cmd_results_new(CMD_SUCCESS, NULL, NULL);

6
sway/security.c
View file

@ -152,11 +152,11 @@ struct feature_policy *get_feature_policy(const char *name) {
} }
if (!policy) { if (!policy) {
policy = alloc_feature_policy(name); policy = alloc_feature_policy(name);
if (!policy) { sway_assert(policy, "Unable to allocate security policy");
sway_abort("Unable to allocate security policy"); if (policy) {
}
list_add(config->feature_policies, policy); list_add(config->feature_policies, policy);
} }
}
return policy; return policy;
} }