From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([209.51.188.92]:44718) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gr25B-0004T4-UG for qemu-devel@nongnu.org; Tue, 05 Feb 2019 09:52:18 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gr1wj-0000Tv-Sp for qemu-devel@nongnu.org; Tue, 05 Feb 2019 09:43:38 -0500 Received: from mx1.redhat.com ([209.132.183.28]:51387) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1gr1wi-0000Re-RM for qemu-devel@nongnu.org; Tue, 05 Feb 2019 09:43:33 -0500 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id A0F5481DED for ; Tue, 5 Feb 2019 14:43:30 +0000 (UTC) From: Igor Mammedov Date: Tue, 5 Feb 2019 15:31:27 +0100 Message-Id: <1549377087-205549-1-git-send-email-imammedo@redhat.com> Subject: [Qemu-devel] [PATCH] hostmem: fix crash when querying empty host-nodes property via QMP List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: ehabkost@redhat.com, armbru@redhat.com, eblake@redhat.com QEMU will crashes with qapi/qobject-output-visitor.c:210: qobject_output_complete: Assertion `qov->root && ((&qov->stack)->slh_first == ((void *)0))' failed when trying to get value of empty hostmem.host-nodes property. Fix it by calling visitor even if host-nodes wasn't set before exiting from property getter to return empty list. Signed-off-by: Igor Mammedov --- backends/hostmem.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/backends/hostmem.c b/backends/hostmem.c index 0c8ef17..fe14be5 100644 --- a/backends/hostmem.c +++ b/backends/hostmem.c @@ -86,7 +86,7 @@ host_memory_backend_get_host_nodes(Object *obj, Visitor *v, const char *name, value = find_first_bit(backend->host_nodes, MAX_NODES); if (value == MAX_NODES) { - return; + goto ret; } *node = g_malloc0(sizeof(**node)); @@ -104,6 +104,7 @@ host_memory_backend_get_host_nodes(Object *obj, Visitor *v, const char *name, node = &(*node)->next; } while (true); +ret: visit_type_uint16List(v, name, &host_nodes, errp); } -- 2.7.4