diff options
author | Tiago Cunha <tcunha@gmx.com> | 2011-08-21 12:39:34 +0000 |
---|---|---|
committer | Tiago Cunha <tcunha@gmx.com> | 2011-08-21 12:39:34 +0000 |
commit | 2651c0d69c95a0a114bb65a684d83c89a8a49a36 (patch) | |
tree | 393f8cc653706faa35d7e860cc89a280eb2a9e00 | |
parent | 87a2a13f6841236b4e52313488062fcd50e03352 (diff) | |
download | rtmux-2651c0d69c95a0a114bb65a684d83c89a8a49a36.tar.gz rtmux-2651c0d69c95a0a114bb65a684d83c89a8a49a36.tar.bz2 rtmux-2651c0d69c95a0a114bb65a684d83c89a8a49a36.zip |
Sync OpenBSD patchset 947:
Fix a couple of memory leaks, from marcel partap.
-rw-r--r-- | server-client.c | 2 | ||||
-rw-r--r-- | status.c | 4 |
2 files changed, 5 insertions, 1 deletions
diff --git a/server-client.c b/server-client.c index badbe1be..6ed53b8a 100644 --- a/server-client.c +++ b/server-client.c @@ -170,6 +170,8 @@ server_client_lost(struct client *c) if (c->cwd != NULL) xfree(c->cwd); + environ_free(&c->environ); + close(c->ibuf.fd); imsg_clear(&c->ibuf); event_del(&c->event); @@ -551,8 +551,10 @@ status_find_job(struct client *c, char **iptr) /* First try in the new tree. */ so_find.cmd = cmd; so = RB_FIND(status_out_tree, &c->status_new, &so_find); - if (so != NULL && so->out != NULL) + if (so != NULL && so->out != NULL) { + xfree(cmd); return (so->out); + } /* If not found at all, start the job and add to the tree. */ if (so == NULL) { |