From 21c6cfc2130cb9a5e691af89e384fc4076fd71fa Mon Sep 17 00:00:00 2001 From: Chris Lalancette Date: Fri, 23 Apr 2010 11:59:02 -0400 Subject: [PATCH] Fix printing of pathnames on error in qemuDomainSnapshotLoad. While doing some testing of the snapshot code I noticed that if qemuDomainSnapshotLoad failed, it would print a NULL as part of the error. That's not desirable, so leave the full_path variable around until after we are done printing errors. Signed-off-by: Chris Lalancette --- src/qemu/qemu_driver.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 0a0d9bc88f..3c4876eb82 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -1388,11 +1388,11 @@ static void qemuDomainSnapshotLoad(void *payload, } ret = virFileReadAll(fullpath, 1024*1024*1, &xmlStr); - VIR_FREE(fullpath); if (ret < 0) { /* Nothing we can do here, skip this one */ VIR_ERROR("Failed to read snapshot file %s: %s", fullpath, virStrerror(errno, ebuf, sizeof(ebuf))); + VIR_FREE(fullpath); continue; } @@ -1400,12 +1400,14 @@ static void qemuDomainSnapshotLoad(void *payload, if (def == NULL) { /* Nothing we can do here, skip this one */ VIR_ERROR("Failed to parse snapshot XML from file '%s'", fullpath); + VIR_FREE(fullpath); VIR_FREE(xmlStr); continue; } virDomainSnapshotAssignDef(&vm->snapshots, def); + VIR_FREE(fullpath); VIR_FREE(xmlStr); } -- GitLab