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.

diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c
index d027880d258ffe17f556163bf7b30fcf0d241c4b..374dcd84d495099014f138ce59d57f4613163768 100644 (file)
--- 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 95931517473b0c8e7179223b88adf625d8868a21..c79ef04a620adce8b50d8b2d4ac88afcf920f37e 100644 (file)
--- 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);
 }