]> git.proxmox.com Git - mirror_qemu.git/commit
json-streamer: Don't leak tokens on incomplete parse
authorEric Blake <eblake@redhat.com>
Wed, 18 May 2016 21:46:52 +0000 (15:46 -0600)
committerMarkus Armbruster <armbru@redhat.com>
Thu, 30 Jun 2016 13:24:36 +0000 (15:24 +0200)
commitba4dba54347d5062436a8553f527dbbed6dcf069
tree55d7c7bd7ab561fffd1f600589f40e6e5f457d22
parent297e8005f88d4360480eaa2c07220fa8853f0448
json-streamer: Don't leak tokens on incomplete parse

Valgrind complained about a number of leaks in
tests/check-qobject-json:

==12657==    definitely lost: 17,247 bytes in 1,234 blocks

All of which had the same root cause: on an incomplete parse,
we were abandoning the token queue without cleaning up the
allocated data within each queue element.  Introduced in
commit 95385fe, when we switched from QList (which recursively
frees contents) to g_queue (which does not).

We don't yet require glib 2.32 with its g_queue_free_full(),
so open-code it instead.

CC: qemu-stable@nongnu.org
Signed-off-by: Eric Blake <eblake@redhat.com>
Message-Id: <1463608012-12760-1-git-send-email-eblake@redhat.com>
Reviewed-by: Markus Armbruster <armbru@redhat.com>
Signed-off-by: Markus Armbruster <armbru@redhat.com>
qobject/json-streamer.c