Do not leak path or use it after free.

diff --git a/usr.bin/tmux/cmd-load-buffer.c b/usr.bin/tmux/cmd-load-buffer.c
index f89d469..5309dc8 100644 (file)
--- a/usr.bin/tmux/cmd-load-buffer.c
+++ b/usr.bin/tmux/cmd-load-buffer.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: cmd-load-buffer.c,v 1.52 2018/07/11 08:29:21 nicm Exp $ */
+/* $OpenBSD: cmd-load-buffer.c,v 1.53 2018/07/31 13:06:44 nicm Exp $ */
 
 /*
  * Copyright (c) 2009 Tiago Cunha <me@tiagocunha.org>
@@ -85,7 +85,7 @@ cmd_load_buffer_exec(struct cmd *self, struct cmdq_item *item)
                error = server_set_stdin_callback(c, cmd_load_buffer_callback,
                    cdata, &cause);
                if (error != 0) {
-                       cmdq_error(item, "%s: %s", path, cause);
+                       cmdq_error(item, "-: %s", cause);
                        free(cause);
                        return (CMD_RETURN_ERROR);
                }
@@ -93,6 +93,8 @@ cmd_load_buffer_exec(struct cmd *self, struct cmdq_item *item)
        }
 
        file = server_client_get_path(c, path);
+       free(path);
+
        f = fopen(file, "rb");
        if (f == NULL) {
                cmdq_error(item, "%s: %s", file, strerror(errno));

diff --git a/usr.bin/tmux/cmd-save-buffer.c b/usr.bin/tmux/cmd-save-buffer.c
index 1f433c7..20b0565 100644 (file)
--- a/usr.bin/tmux/cmd-save-buffer.c
+++ b/usr.bin/tmux/cmd-save-buffer.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: cmd-save-buffer.c,v 1.44 2018/07/11 08:29:21 nicm Exp $ */
+/* $OpenBSD: cmd-save-buffer.c,v 1.45 2018/07/31 13:06:44 nicm Exp $ */
 
 /*
  * Copyright (c) 2009 Tiago Cunha <me@tiagocunha.org>
@@ -106,6 +106,8 @@ cmd_save_buffer_exec(struct cmd *self, struct cmdq_item *item)
                flags = "ab";
 
        file = server_client_get_path(c, path);
+       free(path);
+
        f = fopen(file, flags);
        if (f == NULL) {
                cmdq_error(item, "%s: %s", file, strerror(errno));
@@ -122,7 +124,6 @@ cmd_save_buffer_exec(struct cmd *self, struct cmdq_item *item)
 
        fclose(f);
        free(file);
-       free(path);
 
        return (CMD_RETURN_NORMAL);