[libvirt] [PATCH] util: Prevent libvirtd crash

[Eric Blake]

On 08/28/2012 04:28 AM, Alex Jia wrote:
> * src/util/virnetdevopenvswitch.c (virNetDevOpenvswitchAddPort): avoid libvirtd
> crash due to derefing a NULL virtVlan->tag.
> 
> RHBZ: https://bugzilla.redhat.com/show_bug.cgi?id=852383
> 
> Signed-off-by: Alex Jia <ajia at redhat.com>
> ---
>  src/util/virnetdevopenvswitch.c |    3 ++-
>  1 files changed, 2 insertions(+), 1 deletions(-)
> 
> diff --git a/src/util/virnetdevopenvswitch.c b/src/util/virnetdevopenvswitch.c
> index 601d79e..7d38ff8 100644
> --- a/src/util/virnetdevopenvswitch.c
> +++ b/src/util/virnetdevopenvswitch.c
> @@ -100,7 +100,8 @@ int virNetDevOpenvswitchAddPort(const char *brname, const char *ifname,
>                  virBufferAsprintf(buf, "%d", virtVlan->tag[i]);
>              }
>          } else {
> -            virBufferAsprintf(buf, "tag=%d", virtVlan->tag[0]);
> +            if (virtVlan->nTags)

You could avoid a level of indentation by using 'else if (virtVlan->nTags)'

ACK.

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

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