Re: [Qemu-devel] [PATCH] block/qapi: Plug memory leak on query-block error path

[Kevin Wolf]

Am 20.11.2015 um 13:53 hat Markus Armbruster geschrieben:
> Spotted by Coverity.
> 
> Signed-off-by: Markus Armbruster 

Reviewed-by: Kevin Wolf 

[Qemu-devel] [PATCH] block/qapi: Plug memory leak on query-block error path

[Markus Armbruster]

Spotted by Coverity.

Signed-off-by: Markus Armbruster 
---
 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, >value, _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,
-- 
2.4.3

Re: [Qemu-devel] [PATCH] block/qapi: Plug memory leak on query-block error path

[Eric Blake]

On 11/20/2015 05:53 AM, Markus Armbruster wrote:
> Spotted by Coverity.

Worth mentioning that commit 553a7e87 was the culprit.

> 
> Signed-off-by: Markus Armbruster 
> ---
>  block/qapi.c | 8 +++-
>  1 file changed, 3 insertions(+), 5 deletions(-)
> 

-- 
Eric Blake   eblake redhat com+1-919-301-3266
Libvirt virtualization library http://libvirt.org



signature.asc
Description: OpenPGP digital signature