Memory leak in error path and unnecessary assignment, from clang.

diff --git a/usr.bin/tmux/cmd-save-buffer.c b/usr.bin/tmux/cmd-save-buffer.c
index 2075578..1e9b118 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.22 2014/04/07 10:32:16 nicm Exp $ */
+/* $OpenBSD: cmd-save-buffer.c,v 1.23 2014/04/16 23:05:38 nicm Exp $ */
 
 /*
  * Copyright (c) 2009 Tiago Cunha <me@tiagocunha.org>
@@ -142,7 +142,6 @@ do_print:
                return (CMD_RETURN_ERROR);
        }
        msg = NULL;
-       msglen = 0;
 
        used = 0;
        while (used != pb->size) {

diff --git a/usr.bin/tmux/grid.c b/usr.bin/tmux/grid.c
index 6c00ca0..4b3de5c 100644 (file)
--- a/usr.bin/tmux/grid.c
+++ b/usr.bin/tmux/grid.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: grid.c,v 1.36 2014/03/31 21:42:27 nicm Exp $ */
+/* $OpenBSD: grid.c,v 1.37 2014/04/16 23:05:38 nicm Exp $ */
 
 /*
  * Copyright (c) 2008 Nicholas Marriott <nicm@users.sourceforge.net>
@@ -624,7 +624,7 @@ grid_string_cells(struct grid *gd, u_int px, u_int py, u_int nx,
                off += size;
        }
 
-        if (trim) {
+       if (trim) {
                while (off > 0 && buf[off - 1] == ' ')
                        off--;
        }

diff --git a/usr.bin/tmux/procname.c b/usr.bin/tmux/procname.c
index b3acfd0..4fb9603 100644 (file)
--- a/usr.bin/tmux/procname.c
+++ b/usr.bin/tmux/procname.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: procname.c,v 1.11 2013/10/10 12:39:24 nicm Exp $ */
+/* $OpenBSD: procname.c,v 1.12 2014/04/16 23:05:38 nicm Exp $ */
 
 /*
  * Copyright (c) 2009 Nicholas Marriott <nicm@users.sourceforge.net>
@@ -96,7 +96,7 @@ get_proc_name(int fd, char *tty)
 
 retry:
        if (sysctl(mib, nitems(mib), NULL, &len, NULL, 0) == -1)
-               return (NULL);
+               goto error;
        len = (len * 5) / 4;
 
        if ((newbuf = realloc(buf, len)) == NULL)