From 5acee1c04ed38afd6a32da4a66e6855ccdc52af3 Mon Sep 17 00:00:00 2001 From: nicm Date: Wed, 16 Apr 2014 23:05:38 +0000 Subject: Memory leak in error path and unnecessary assignment, from clang. --- cmd-save-buffer.c | 1 - grid.c | 2 +- procname.c | 2 +- 3 files changed, 2 insertions(+), 3 deletions(-) diff --git a/cmd-save-buffer.c b/cmd-save-buffer.c index 6c15fb42..b6ee2e49 100644 --- a/cmd-save-buffer.c +++ b/cmd-save-buffer.c @@ -142,7 +142,6 @@ do_print: return (CMD_RETURN_ERROR); } msg = NULL; - msglen = 0; used = 0; while (used != pb->size) { diff --git a/grid.c b/grid.c index df2f8b16..28210185 100644 --- a/grid.c +++ b/grid.c @@ -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/procname.c b/procname.c index ee9b99dc..5d3bc306 100644 --- a/procname.c +++ b/procname.c @@ -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) -- cgit v1.2.3