mirrors/sway
1
0
Fork 0
mirror of https://github.com/swaywm/sway.git synced 2024-11-18 05:59:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

cleanup output-background subcommand handling

Browse source 
- fixes a double-free error when access() failed.

- refactor code to make memory managment (alloc/free) more straightforward
   - do not bring the temporary wordexp_t struct around
   - do not postpone errors handling
This commit is contained in:
ael-code 2018-06-26 12:57:22 +02:00
parent 4550cb2b3e
commit a4578815f1
No known key found for this signature in database
GPG key ID: 3390538CF7E96023
1 changed files with 29 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -69,42 +69,49 @@ struct cmd_results *output_cmd_background(int argc, char **argv) {
return cmd_res; return cmd_res;
} }
free(src); free(src);
src = p.we_wordv[0]; src = strdup(p.we_wordv[0]);
if (config->reading && *src != '/') {
char *conf = strdup(config->current_config);
if (conf) {
char *conf_path = dirname(conf);
src = malloc(strlen(conf_path) + strlen(src) + 2);
if (!src) {
free(conf);
wordfree(&p); wordfree(&p);
wlr_log(L_ERROR, if (!src) {
"Unable to allocate resource: Not enough memory"); wlr_log(L_ERROR, "Failed to duplicate string");
return cmd_results_new(CMD_FAILURE, "output",
"Unable to allocate resource");
}
if (config->reading && *src != '/') {
// src file is inside configuration dir
char *conf = strdup(config->current_config);
if(!conf) {
wlr_log(L_ERROR, "Failed to duplicate string");
return cmd_results_new(CMD_FAILURE, "output", return cmd_results_new(CMD_FAILURE, "output",
"Unable to allocate resources"); "Unable to allocate resources");
} }
sprintf(src, "%s/%s", conf_path, p.we_wordv[0]);
char *conf_path = dirname(conf);
char *rel_path = src;
src = malloc(strlen(conf_path) + strlen(src) + 2);
if (!src) {
free(rel_path);
free(conf); free(conf);
} else { wlr_log(L_ERROR, "Unable to allocate memory");
wlr_log(L_ERROR, "Unable to allocate background source"); return cmd_results_new(CMD_FAILURE, "output",
"Unable to allocate resources");
} }
sprintf(src, "%s/%s", conf_path, rel_path);
free(rel_path);
free(conf);
} }
if (access(src, F_OK) == -1) { if (access(src, F_OK) == -1) {
struct cmd_results *cmd_res = cmd_results_new(CMD_FAILURE, "output", struct cmd_results *cmd_res = cmd_results_new(CMD_FAILURE, "output",
"Unable to access background file '%s': %s", src, strerror(errno)); "Unable to access background file '%s': %s", src, strerror(errno));
free(src); free(src);
wordfree(&p);
return cmd_res; return cmd_res;
} }
output->background = strdup(src); output->background = src;
output->background_option = strdup(mode); output->background_option = strdup(mode);
if (src != p.we_wordv[0]) {
free(src);
}
wordfree(&p);
argc -= j + 1; argv += j + 1; argc -= j + 1; argv += j + 1;
} }