From: Ján Tomko <jtomko@redhat.com>
Date: Wed, 28 Nov 2012 14:59:07 +0000 (+0100)
Subject: util: check for NULL parameter in virFileWrapperFdCatchError
X-Git-Tag: CVE-2012-3411~26
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7794e02c566b2eb8f64372b907ade3a23939e54a;p=thirdparty%2Flibvirt.git

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 d027880d25..374dcd84d4 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 9593151747..c79ef04a62 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);
 }