Re: [libvirt] [PATCH 6/6] util: Plug memory leak on virNetDevMacVLanCreateWithVPortProfile() error path

On 11/29/2011 10:57 PM, ajia(a)redhat.com wrote: Close, but this botches the case when !withTap (then, rc is 0 and you just nuked stdin). Here's what I'm squashing before pushing (and hopefully Coverity isn't too confused because we overload rc to be either an fd or just 0 depending on withTap): diff --git i/src/util/virnetdevmacvlan.c w/src/util/virnetdevmacvlan.c index 80a9f80..5e55b72 100644 --- i/src/util/virnetdevmacvlan.c +++ w/src/util/virnetdevmacvlan.c @@ -582,8 +582,10 @@ create_name: virNetDevError(VIR_ERR_INTERNAL_ERROR, _("cannot set bandwidth limits on %s"), cr_ifname); - VIR_FORCE_CLOSE(rc); - rc = -1; + if (withTap) + VIR_FORCE_CLOSE(rc); /* sets rc to -1 */ + else + rc = -1; goto disassociate_exit; } -- Eric Blake eblake(a)redhat.com +1-919-301-3266 Libvirt virtualization library http://libvirt.org