On 07/14/2017 07:04 AM, Vladimir Sementsov-Ogievskiy wrote: > 14.07.2017 13:42, Peter Maydell wrote: >> On 11 July 2017 at 17:07, Max Reitz <mre...@redhat.com> wrote: >>> From: Vladimir Sementsov-Ogievskiy <vsement...@virtuozzo.com> >>>
>> Probably the best fix for this is to make bitmap_free() do
>> nothing when handed NULL.
>
> Agree, my stupid omission. Can this be fixed in flight? Just squash into
> commit "qcow2: add bitmaps extension"
Your commit has already landed on master (commit 469c71e), so you'll
need to resubmit this as a new patch in a top-level thread. But given
the simplicity, feel free to add:
Reviewed-by: Eric Blake <ebl...@redhat.com>
>
> diff --git a/block/qcow2-bitmap.c b/block/qcow2-bitmap.c
> index 8448bec46d..39dfe16fc0 100644
> --- a/block/qcow2-bitmap.c
> +++ b/block/qcow2-bitmap.c
> @@ -487,6 +487,10 @@ static inline void bitmap_directory_to_be(uint8_t
> *dir, size_t size)
>
> static void bitmap_free(Qcow2Bitmap *bm)
> {
> + if (bm == NULL) {
> + return;
> + }
> +
> g_free(bm->name);
> g_free(bm);
> }
> //
>
>>
>> thanks
>> -- PMM
>
>
--
Eric Blake, Principal Software Engineer
Red Hat, Inc. +1-919-301-3266
Virtualization: qemu.org | libvirt.org
signature.asc
Description: OpenPGP digital signature
