On Mon, Apr 10, 2017 at 09:53:58AM +0200, Pavel Hrdina wrote:
All of the variables are filled inside a loop and therefore
needs to be also freed in every cycle.
Signed-off-by: Pavel Hrdina <phrdina@xxxxxxxxxx>
---
src/conf/node_device_conf.c | 10 +++++-----
src/conf/storage_conf.c | 1 +
src/util/virsysinfo.c | 2 ++
3 files changed, 8 insertions(+), 5 deletions(-)
diff --git a/src/conf/node_device_conf.c b/src/conf/node_device_conf.c
index 7d0baa9d1a..e21a98d51f 100644
--- a/src/conf/node_device_conf.c
+++ b/src/conf/node_device_conf.c
@@ -1582,7 +1582,6 @@ virNodeDeviceDefParseXML(xmlXPathContextPtr ctxt,
for (i = 0, m = 0; i < n; i++) {
xmlNodePtr node = nodes[i];
char *tmp = virXMLPropString(node, "type");
- virNodeDevDevnodeType type;
int val;
if (!tmp) {
@@ -1591,15 +1590,16 @@ virNodeDeviceDefParseXML(xmlXPathContextPtr ctxt,
goto error;
}
- if ((val = virNodeDevDevnodeTypeFromString(tmp)) < 0) {
+ val = virNodeDevDevnodeTypeFromString(tmp);
+ VIR_FREE(tmp);
+
+ if (val < 0) {
virReportError(VIR_ERR_CONFIG_UNSUPPORTED,
_("unknown devnode type '%s'"), tmp);
This accesses the 'tmp' variable after it has been freed. I suggest preserving the error message, so there will be two VIR_FREE's needed - one for the success path and one for the error path. Jan
- VIR_FREE(tmp);
goto error;
}
Attachment:
signature.asc
Description: Digital signature
-- libvir-list mailing list libvir-list@xxxxxxxxxx https://www.redhat.com/mailman/listinfo/libvir-list
