[libvirt] [PATCH 1/4] qemu: Check if virQEMUCapsNewCopy(...) has failed

Laine Stump laine at laine.org
Thu Feb 9 19:18:40 UTC 2017


On 02/09/2017 09:13 AM, Marc Hartmayer wrote:
> Check if virQEMUCapsNewCopy(...) has failed, thus a segmentation fault
> in virQEMUCapsFilterByMachineType(...) will be avoided.
>
> Signed-off-by: Marc Hartmayer <mhartmay at linux.vnet.ibm.com>
> Reviewed-by: Bjoern Walk <bwalk at linux.vnet.ibm.com>
> ---
>   src/qemu/qemu_capabilities.c | 4 ++++
>   1 file changed, 4 insertions(+)
>
> diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c
> index 3247d25..399e314 100644
> --- a/src/qemu/qemu_capabilities.c
> +++ b/src/qemu/qemu_capabilities.c
> @@ -4928,6 +4928,10 @@ virQEMUCapsCacheLookupCopy(virCapsPtr caps,
>   
>       ret = virQEMUCapsNewCopy(qemuCaps);
>       virObjectUnref(qemuCaps);
> +
> +    if (!ret)
> +        return NULL;
> +
>       virQEMUCapsFilterByMachineType(ret, machineType);
>       return ret;
>   }


ACK (and to respond to your self-reply, I don't think a cleanup: label 
is necessary. The function is too simple to bother cluttering it up).


I'll push these all in a minute (except 4/4, where I'm waiting for your 
approval to a small change)




More information about the libvir-list mailing list