mirrors/sway
1
0
Fork 0
mirror of https://github.com/swaywm/sway.git synced 2024-12-29 16:36:26 +01:00
Code Issues Projects Releases Packages Wiki Activity

Shuffle variables to satisfy -Werror=restrict

Browse source 
This also fixes an invalid strlen invocation on uninitialized memory.
This commit is contained in:
Daniel De Graaf 2022-04-09 12:10:24 -04:00 committed by Simon Ser
parent 20181974c2
commit cf413b9c0b
1 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
sway/commands/output/background.c
View file

@ -102,19 +102,19 @@ struct cmd_results *output_cmd_background(int argc, char **argv) {
} }
char *conf_path = dirname(conf); char *conf_path = dirname(conf);
char *rel_path = src; char *real_src = malloc(strlen(conf_path) + strlen(src) + 2);
src = malloc(strlen(conf_path) + strlen(src) + 2); if (!real_src) {
if (!src) { free(src);
free(rel_path);
free(conf); free(conf);
sway_log(SWAY_ERROR, "Unable to allocate memory"); sway_log(SWAY_ERROR, "Unable to allocate memory");
return cmd_results_new(CMD_FAILURE, return cmd_results_new(CMD_FAILURE,
"Unable to allocate resources"); "Unable to allocate resources");
} }
snprintf(src, strlen(conf_path) + strlen(src) + 2, "%s/%s", conf_path, rel_path); snprintf(real_src, strlen(conf_path) + strlen(src) + 2, "%s/%s", conf_path, src);
free(rel_path); free(src);
free(conf); free(conf);
src = real_src;
} }
bool can_access = access(src, F_OK) != -1; bool can_access = access(src, F_OK) != -1;