From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:41022) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TvU6g-0000DC-DC for qemu-devel@nongnu.org; Wed, 16 Jan 2013 09:36:56 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1TvU6c-00025z-6S for qemu-devel@nongnu.org; Wed, 16 Jan 2013 09:36:46 -0500 From: Markus Armbruster Date: Wed, 16 Jan 2013 15:36:35 +0100 Message-Id: <1358346998-26328-9-git-send-email-armbru@redhat.com> In-Reply-To: <1358346998-26328-1-git-send-email-armbru@redhat.com> References: <1358346998-26328-1-git-send-email-armbru@redhat.com> Subject: [Qemu-devel] [PATCH 08/11] qemu-log: Plug trivial memory leak in cpu_set_log_filename() List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: qemu-trivial@nongnu.org Signed-off-by: Markus Armbruster --- qemu-log.c | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/qemu-log.c b/qemu-log.c index 64a1b88..1eadf1b 100644 --- a/qemu-log.c +++ b/qemu-log.c @@ -21,10 +21,12 @@ #include "qemu/log.h" #ifdef WIN32 -static const char *logfilename = "qemu.log"; +#define DEFAULT_LOGFILENAME = "qemu.log" #else -static const char *logfilename = "/tmp/qemu.log"; +#define DEFAULT_LOGFILENAME "/tmp/qemu.log" #endif + +static const char *logfilename; FILE *qemu_logfile; int qemu_loglevel; static int log_append = 0; @@ -54,11 +56,13 @@ void qemu_log_mask(int mask, const char *fmt, ...) /* enable or disable low levels log */ void qemu_set_log(int log_flags, bool use_own_buffers) { + const char *fname = logfilename ?: DEFAULT_LOGFILENAME; + qemu_loglevel = log_flags; if (qemu_loglevel && !qemu_logfile) { - qemu_logfile = fopen(logfilename, log_append ? "a" : "w"); + qemu_logfile = fopen(fname, log_append ? "a" : "w"); if (!qemu_logfile) { - perror(logfilename); + perror(fname); _exit(1); } /* must avoid mmap() usage of glibc by setting a buffer "by hand" */ @@ -84,6 +88,7 @@ void qemu_set_log(int log_flags, bool use_own_buffers) void cpu_set_log_filename(const char *filename) { + g_free((void *)logfilename); logfilename = g_strdup(filename); if (qemu_logfile) { fclose(qemu_logfile); -- 1.7.11.7