Re: [libvirt] [PATCH 1/2] Fix improper error return in virInterfaceDefParseProtoIPvX

--- src/conf/interface_conf.c | 14 ++++++++------ 1 files changed, 8 insertions(+), 6 deletions(-) diff --git a/src/conf/interface_conf.c b/src/conf/interface_conf.c index 7cb71ed..fc18eba 100644 --- a/src/conf/interface_conf.c +++ b/src/conf/interface_conf.c @@ -309,10 +309,11 @@ virInterfaceDefParseProtoIPv4(virConnectPtr conn, virInterfaceProtocolDefPtr def def->gateway = tmp; dhcp = virXPathNode(conn, "./dhcp", ctxt); - if (dhcp != NULL) + if (dhcp != NULL) { ret = virInterfaceDefParseDhcp(conn, def, dhcp, ctxt); - if (ret != 0) - return(ret); + if (ret != 0) + return(ret); + } nIpNodes = virXPathNodeSet(conn, "./ip", ctxt, &ipNodes); if (ipNodes == NULL) @@ -365,10 +366,11 @@ virInterfaceDefParseProtoIPv6(virConnectPtr conn, virInterfaceProtocolDefPtr def def->autoconf = 1; dhcp = virXPathNode(conn, "./dhcp", ctxt); - if (dhcp != NULL) + if (dhcp != NULL) { ret = virInterfaceDefParseDhcp(conn, def, dhcp, ctxt); - if (ret != 0) - return(ret); + if (ret != 0) + return(ret); + } nIpNodes = virXPathNodeSet(conn, "./ip", ctxt, &ipNodes); if (ipNodes == NULL)