From: Peter Krempa Date: Mon, 20 Jun 2016 13:34:08 +0000 (+0200) Subject: conf: Fix label name in virDomainGraphicsListensParseXML X-Git-Tag: v2.0.0-rc1~153 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0a07bf3dc5ab3b0315303e24390dc2d980cfe311;p=thirdparty%2Flibvirt.git conf: Fix label name in virDomainGraphicsListensParseXML Use 'cleanup' since it's also used on success. --- diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 0b642a1a05..f2086826a9 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -11136,20 +11136,20 @@ virDomainGraphicsListensParseXML(virDomainGraphicsDefPtr def, /* parse the subelements for graphics types that support it */ nListens = virXPathNodeSet("./listen", ctxt, &listenNodes); if (nListens < 0) - goto error; + goto cleanup; if (nListens > 0) { size_t i; if (VIR_ALLOC_N(def->listens, nListens) < 0) - goto error; + goto cleanup; for (i = 0; i < nListens; i++) { if (virDomainGraphicsListenDefParseXML(&def->listens[i], def, listenNodes[i], i == 0 ? node : NULL, flags) < 0) - goto error; + goto cleanup; def->nListens++; } @@ -11177,7 +11177,7 @@ virDomainGraphicsListensParseXML(virDomainGraphicsDefPtr def, * element. */ if (def->nListens == 0) { if (VIR_APPEND_ELEMENT(def->listens, def->nListens, newListen) < 0) - goto error; + goto cleanup; } else { virDomainGraphicsListenDefPtr glisten = &def->listens[0]; @@ -11195,7 +11195,7 @@ virDomainGraphicsListensParseXML(virDomainGraphicsDefPtr def, } ret = 0; - error: + cleanup: virDomainGraphicsListenDefClear(&newListen); VIR_FREE(listenNodes); VIR_FREE(socketPath);