[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 1/5] qemu-char: Plug memory leak on qemu_chr_open_pt
From: |
Markus Armbruster |
Subject: |
[Qemu-devel] [PATCH 1/5] qemu-char: Plug memory leak on qemu_chr_open_pty() error path |
Date: |
Fri, 11 Nov 2011 10:40:05 +0100 |
Spotted by Coverity.
Signed-off-by: Markus Armbruster <address@hidden>
---
qemu-char.c | 19 ++++++++++---------
1 files changed, 10 insertions(+), 9 deletions(-)
diff --git a/qemu-char.c b/qemu-char.c
index 9fd94d1..b562bf8 100644
--- a/qemu-char.c
+++ b/qemu-char.c
@@ -985,7 +985,7 @@ static int qemu_chr_open_pty(QemuOpts *opts,
CharDriverState **_chr)
CharDriverState *chr;
PtyCharDriver *s;
struct termios tty;
- int slave_fd, len;
+ int master_fd, slave_fd, len;
#if defined(__OpenBSD__) || defined(__DragonFly__)
char pty_name[PATH_MAX];
#define q_ptsname(x) pty_name
@@ -994,10 +994,7 @@ static int qemu_chr_open_pty(QemuOpts *opts,
CharDriverState **_chr)
#define q_ptsname(x) ptsname(x)
#endif
- chr = g_malloc0(sizeof(CharDriverState));
- s = g_malloc0(sizeof(PtyCharDriver));
-
- if (openpty(&s->fd, &slave_fd, pty_name, NULL, NULL) < 0) {
+ if (openpty(&master_fd, &slave_fd, pty_name, NULL, NULL) < 0) {
return -errno;
}
@@ -1007,17 +1004,21 @@ static int qemu_chr_open_pty(QemuOpts *opts,
CharDriverState **_chr)
tcsetattr(slave_fd, TCSAFLUSH, &tty);
close(slave_fd);
- len = strlen(q_ptsname(s->fd)) + 5;
+ chr = g_malloc0(sizeof(CharDriverState));
+
+ len = strlen(q_ptsname(master_fd)) + 5;
chr->filename = g_malloc(len);
- snprintf(chr->filename, len, "pty:%s", q_ptsname(s->fd));
- qemu_opt_set(opts, "path", q_ptsname(s->fd));
- fprintf(stderr, "char device redirected to %s\n", q_ptsname(s->fd));
+ snprintf(chr->filename, len, "pty:%s", q_ptsname(master_fd));
+ qemu_opt_set(opts, "path", q_ptsname(master_fd));
+ fprintf(stderr, "char device redirected to %s\n", q_ptsname(master_fd));
+ s = g_malloc0(sizeof(PtyCharDriver));
chr->opaque = s;
chr->chr_write = pty_chr_write;
chr->chr_update_read_handler = pty_chr_update_read_handler;
chr->chr_close = pty_chr_close;
+ s->fd = master_fd;
s->timer = qemu_new_timer_ms(rt_clock, pty_chr_timer, chr);
*_chr = chr;
--
1.7.6.4
- [Qemu-devel] [PATCH 0/5] Plug a few trivial resource leaks, Markus Armbruster, 2011/11/11
- [Qemu-devel] [PATCH 2/5] ui: Plug memory leaks on parse_keyboard_layout() error path, Markus Armbruster, 2011/11/11
- [Qemu-devel] [PATCH 1/5] qemu-char: Plug memory leak on qemu_chr_open_pty() error path,
Markus Armbruster <=
- [Qemu-devel] [PATCH 5/5] os-posix: Plug fd leak in qemu_create_pidfile(), Markus Armbruster, 2011/11/11
- [Qemu-devel] [PATCH 3/5] qemu-sockets: Plug fd leak on unix_connect_opts() error path, Markus Armbruster, 2011/11/11
- [Qemu-devel] [PATCH 4/5] posix-aio-compat: Plug memory leak on paio_init() error path, Markus Armbruster, 2011/11/11
- Re: [Qemu-devel] [PATCH 0/5] Plug a few trivial resource leaks, Anthony Liguori, 2011/11/11