]> git.proxmox.com Git - mirror_qemu.git/commit - qapi/qobject-output-visitor.c
qmp: Fix reference-counting of qnull on empty output visit
authorEric Blake <eblake@redhat.com>
Fri, 29 Jan 2016 13:49:00 +0000 (06:49 -0700)
committerMarkus Armbruster <armbru@redhat.com>
Mon, 8 Feb 2016 16:29:57 +0000 (17:29 +0100)
commita86156401559cb4401cf9ecc704faeab6fc8bb19
treec82c2d075601d6d394e940f331123ed34f900268
parent08f9541dec51700abef0c37994213164ca4e4fc9
qmp: Fix reference-counting of qnull on empty output visit

Commit 6c2f9a15 ensured that we would not return NULL when the
caller used an output visitor but had nothing to visit. But
in doing so, it added a FIXME about a reference count leak
that could abort qemu in the (unlikely) case of SIZE_MAX such
visits (more plausible on 32-bit).  (Although that commit
suggested we might fix it in time for 2.5, we ran out of time;
fortunately, it is unlikely enough to bite that it was not
worth worrying about during the 2.5 release.)

This fixes things by documenting the internal contracts, and
explaining why the internal function can return NULL and only
the public facing interface needs to worry about qnull(),
thus avoiding over-referencing the qnull_ global object.

It does not, however, fix the stupidity of the stack mixing
up two separate pieces of information; add a FIXME to explain
that issue, which will be fixed shortly in a future patch.

Signed-off-by: Eric Blake <eblake@redhat.com>
Cc: qemu-stable@nongnu.org
Message-Id: <1454075341-13658-25-git-send-email-eblake@redhat.com>
Signed-off-by: Markus Armbruster <armbru@redhat.com>
qapi/qmp-output-visitor.c
tests/test-qmp-output-visitor.c