From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:43856) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1a1amK-0001QY-Ri for qemu-devel@nongnu.org; Wed, 25 Nov 2015 09:10:37 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1a1amJ-0003nW-S5 for qemu-devel@nongnu.org; Wed, 25 Nov 2015 09:10:36 -0500 From: Kevin Wolf Date: Wed, 25 Nov 2015 15:10:23 +0100 Message-Id: <1448460624-16664-6-git-send-email-kwolf@redhat.com> In-Reply-To: <1448460624-16664-1-git-send-email-kwolf@redhat.com> References: <1448460624-16664-1-git-send-email-kwolf@redhat.com> Subject: [Qemu-devel] [PULL 5/6] block/qapi: Plug memory leak on query-block error path List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-block@nongnu.org Cc: kwolf@redhat.com, qemu-devel@nongnu.org From: Markus Armbruster Spotted by Coverity. Signed-off-by: Markus Armbruster Reviewed-by: Kevin Wolf Reviewed-by: Eric Blake Signed-off-by: Kevin Wolf --- block/qapi.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/block/qapi.c b/block/qapi.c index d20262d..267f147 100644 --- a/block/qapi.c +++ b/block/qapi.c @@ -436,7 +436,9 @@ BlockInfoList *qmp_query_block(Error **errp) bdrv_query_info(blk, &info->value, &local_err); if (local_err) { error_propagate(errp, local_err); - goto err; + g_free(info); + qapi_free_BlockInfoList(head); + return NULL; } *p_next = info; @@ -444,10 +446,6 @@ BlockInfoList *qmp_query_block(Error **errp) } return head; - - err: - qapi_free_BlockInfoList(head); - return NULL; } BlockStatsList *qmp_query_blockstats(bool has_query_nodes, -- 1.8.3.1