1 files changed, 9 insertions, 6 deletions

diff --git a/sway/commands/output/background.c b/sway/commands/output/background.c
index 68ee9fe1..d691295f 100644
--- a/sway/commands/output/background.c
+++ b/sway/commands/output/background.c
@@ -102,19 +102,19 @@ struct cmd_results *output_cmd_background(int argc, char **argv) {
                         }
 
                         char *conf_path = dirname(conf);
-                        char *rel_path = src;
-                        src = malloc(strlen(conf_path) + strlen(src) + 2);
-                        if (!src) {
-                                free(rel_path);
+                        char *real_src = malloc(strlen(conf_path) + strlen(src) + 2);
+                        if (!real_src) {
+                                free(src);
                                 free(conf);
                                 sway_log(SWAY_ERROR, "Unable to allocate memory");
                                 return cmd_results_new(CMD_FAILURE,
                                                 "Unable to allocate resources");
                         }
 
-                        sprintf(src, "%s/%s", conf_path, rel_path);
-                        free(rel_path);
+                        snprintf(real_src, strlen(conf_path) + strlen(src) + 2, "%s/%s", conf_path, src);
+                        free(src);
                         free(conf);
+                        src = real_src;
                 }
 
                 bool can_access = access(src, F_OK) != -1;
@@ -123,7 +123,10 @@ struct cmd_results *output_cmd_background(int argc, char **argv) {
                                         src);
                         config_add_swaynag_warning("Unable to access background file '%s'",
                                         src);
+                        struct cmd_results *result = cmd_results_new(CMD_FAILURE,
+                                        "unable to access background file '%s'", src);
                         free(src);
+                        return result;
                 } else {
                         output->background = src;
                         output->background_option = strdup(mode);