mirror of
				https://github.com/swaywm/sway.git
				synced 2025-11-03 09:01:43 -05:00 
			
		
		
		
	Do not add empty policies
Policy allocation failure is non-fatal
This commit is contained in:
		
							parent
							
								
									4f905ecb96
								
							
						
					
					
						commit
						7d8a84b587
					
				
					 2 changed files with 6 additions and 6 deletions
				
			
		| 
						 | 
					@ -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",
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -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;
 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue