]> git.ipfire.org Git - thirdparty/qemu.git/commitdiff
log: Plug memory leak on multiple -dfilter
authorMarkus Armbruster <armbru@redhat.com>
Wed, 15 Jun 2016 17:27:14 +0000 (19:27 +0200)
committerMarkus Armbruster <armbru@redhat.com>
Mon, 20 Jun 2016 14:38:14 +0000 (16:38 +0200)
-dfilter overwrites any previous filter.  The overwritten filter is
leaked.  Leaks since the beginning (commit 3514552, v2.6.0).  Free it
properly.

Signed-off-by: Markus Armbruster <armbru@redhat.com>
Message-Id: <1466011636-6112-2-git-send-email-armbru@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
util/log.c

index 5ad72c197f5bad785c2e0202978b88e8f1398ce9..6f45e0a26c6c549d0bef8ce3df5e1196019e19e4 100644 (file)
@@ -145,9 +145,16 @@ bool qemu_log_in_addr_range(uint64_t addr)
 void qemu_set_dfilter_ranges(const char *filter_spec)
 {
     gchar **ranges = g_strsplit(filter_spec, ",", 0);
+
+    if (debug_regions) {
+        g_array_unref(debug_regions);
+        debug_regions = NULL;
+    }
+
     if (ranges) {
         gchar **next = ranges;
         gchar *r = *next++;
+
         debug_regions = g_array_sized_new(FALSE, FALSE,
                                           sizeof(Range), g_strv_length(ranges));
         while (r) {