[libvirt] [PATCH] util: check for NULL parameter in virFileWrapperFdCatchError

This reverts 8927c0e qemu: fix a crash when save file can't be opened and allows virFileWrapperFdCatchError to be called with NULL instead. --- src/qemu/qemu_driver.c | 6 ++---- src/util/virfile.c | 2 +- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index d58656a..7e29608 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -2908,8 +2908,7 @@ qemuDomainSaveMemory(struct qemud_driver *driver, cleanup: VIR_FORCE_CLOSE(fd); - if (wrapperFd) - virFileWrapperFdCatchError(wrapperFd); + virFileWrapperFdCatchError(wrapperFd); virFileWrapperFdFree(wrapperFd); VIR_FREE(xml); @@ -3365,8 +3364,7 @@ doCoreDump(struct qemud_driver *driver, cleanup: VIR_FORCE_CLOSE(fd); if (ret != 0) { - if (wrapperFd) - virFileWrapperFdCatchError(wrapperFd); + virFileWrapperFdCatchError(wrapperFd); unlink(path); } virFileWrapperFdFree(wrapperFd); diff --git a/src/util/virfile.c b/src/util/virfile.c index 9593151..c79ef04 100644 --- a/src/util/virfile.c +++ b/src/util/virfile.c @@ -369,7 +369,7 @@ virFileWrapperFdClose(virFileWrapperFdPtr wfd) void virFileWrapperFdCatchError(virFileWrapperFdPtr wfd) { - if (wfd->err_msg) + if (wfd && wfd->err_msg) VIR_WARN("iohelper reports: %s", wfd->err_msg); } -- 1.7.8.6