[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-trivial] [PATCH 2/5] ui: Plug memory leaks on parse_keyboard_layou
From: |
Markus Armbruster |
Subject: |
[Qemu-trivial] [PATCH 2/5] ui: Plug memory leaks on parse_keyboard_layout() error path |
Date: |
Fri, 11 Nov 2011 10:40:06 +0100 |
Spotted by Coverity.
Signed-off-by: Markus Armbruster <address@hidden>
---
ui/keymaps.c | 12 +++++++-----
1 files changed, 7 insertions(+), 5 deletions(-)
diff --git a/ui/keymaps.c b/ui/keymaps.c
index f54a114..f55a2aa 100644
--- a/ui/keymaps.c
+++ b/ui/keymaps.c
@@ -92,15 +92,17 @@ static kbd_layout_t *parse_keyboard_layout(const
name2keysym_t *table,
int len;
filename = qemu_find_file(QEMU_FILE_TYPE_KEYMAP, language);
-
- if (!k)
- k = g_malloc0(sizeof(kbd_layout_t));
- if (!(filename && (f = fopen(filename, "r")))) {
+ f = filename ? fopen(filename, "r") : NULL;
+ g_free(filename);
+ if (!f) {
fprintf(stderr,
"Could not read keymap file: '%s'\n", language);
return NULL;
}
- g_free(filename);
+
+ if (!k)
+ k = g_malloc0(sizeof(kbd_layout_t));
+
for(;;) {
if (fgets(line, 1024, f) == NULL)
break;
--
1.7.6.4
- [Qemu-trivial] [PATCH 0/5] Plug a few trivial resource leaks, Markus Armbruster, 2011/11/11
- [Qemu-trivial] [PATCH 2/5] ui: Plug memory leaks on parse_keyboard_layout() error path,
Markus Armbruster <=
- [Qemu-trivial] [PATCH 3/5] qemu-sockets: Plug fd leak on unix_connect_opts() error path, Markus Armbruster, 2011/11/11
- [Qemu-trivial] [PATCH 5/5] os-posix: Plug fd leak in qemu_create_pidfile(), Markus Armbruster, 2011/11/11
- [Qemu-trivial] [PATCH 1/5] qemu-char: Plug memory leak on qemu_chr_open_pty() error path, Markus Armbruster, 2011/11/11
- [Qemu-trivial] [PATCH 4/5] posix-aio-compat: Plug memory leak on paio_init() error path, Markus Armbruster, 2011/11/11
- Re: [Qemu-trivial] [Qemu-devel] [PATCH 0/5] Plug a few trivial resource leaks, Anthony Liguori, 2011/11/11