[libvirt] [PATCH] Check for NULL in qemu monitor event filter

[Ján Tomko]

On 09/22/2014 05:57 PM, Eric Blake wrote:
> On 09/22/2014 06:09 AM, Ján Tomko wrote:
>> When virConnectDomainQemuMonitorEventRegister is called with the
>> VIR_CONNECT_DOMAIN_QEMU_MONITOR_EVENT_REGISTER_REGEX flag,
>> ignore the flag instead of crashing.
>>
>> https://bugzilla.redhat.com/show_bug.cgi?id=1144920
>> ---
>>  src/conf/domain_event.c | 2 +-
>>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> That's one alternative.  I was thinking more along the lines of
> forbidding the use of flags with a NULL event string:
> 

I think ingoring it would be nicer than throwing an error.

I'm fine with your fix as well, but the error message could be more specific
(as NULL argument is allowed without the flags).

Jan

> diff --git i/src/libvirt-qemu.c w/src/libvirt-qemu.c
> index fed08fc..e9bc82e 100644
> --- i/src/libvirt-qemu.c
> +++ w/src/libvirt-qemu.c
> @@ -289,6 +289,9 @@
> virConnectDomainQemuMonitorEventRegister(virConnectPtr conn,
>      }
>      virCheckNonNullArgGoto(cb, error);
>      virCheckReadOnlyGoto(conn->flags, error);
> +    if (flags & (VIR_CONNECT_DOMAIN_QEMU_MONITOR_EVENT_REGISTER_REGEX |
> +                 VIR_CONNECT_DOMAIN_QEMU_MONITOR_EVENT_REGISTER_NOCASE))
> +        virCheckNonNullArgGoto(event, error);
> 
>      if (conn->driver &&
> conn->driver->connectDomainQemuMonitorEventRegister) {
>          int ret;
> 
> 
> 
> 
> --
> libvir-list mailing list
> libvir-list at redhat.com
> https://www.redhat.com/mailman/listinfo/libvir-list
> 


-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 819 bytes
Desc: OpenPGP digital signature
URL: <http://listman.redhat.com/archives/libvir-list/attachments/20140922/0de2643b/attachment-0001.sig>