[libvirt] [PATCH] conf: return immediately on error in dhcp host element

[Eric Blake]

On 03/19/2012 11:32 AM, Laine Stump wrote:
> If and error was encountered parsing a dhcp host entry mac address or
> name, parsing would continue and log a less descriptive error that
> might make it more difficult to notice the true nature of the problem.
> 
> This patch returns immediately on logging the first error.
> ---
>  src/conf/network_conf.c |    2 ++
>  1 files changed, 2 insertions(+), 0 deletions(-)
> 
> diff --git a/src/conf/network_conf.c b/src/conf/network_conf.c
> index 0333141..0fa58f8 100644
> --- a/src/conf/network_conf.c
> +++ b/src/conf/network_conf.c
> @@ -430,6 +430,7 @@ virNetworkDHCPRangeDefParseXML(const char *networkName,
>                                        _("Cannot parse MAC address '%s' in network '%s'"),
>                                        mac, networkName);
>                  VIR_FREE(mac);
> +                return -1;
>              }
>              name = virXMLPropString(cur, "name");
>              if ((name != NULL) && (!c_isalpha(name[0]))) {
> @@ -437,6 +438,7 @@ virNetworkDHCPRangeDefParseXML(const char *networkName,
>                                        _("Cannot use name address '%s' in network '%s'"),
>                                        name, networkName);
>                  VIR_FREE(name);
> +                return -1;

Memory leak - you just leaked mac.  Needs a v2.

-- 
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: 620 bytes
Desc: OpenPGP digital signature
URL: <http://listman.redhat.com/archives/libvir-list/attachments/20120319/2068f007/attachment-0001.sig>