External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2024-12-23 06:05:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

util: check for NULL parameter in virFileWrapperFdCatchError

Browse Source 
This reverts 8927c0e qemu: fix a crash when save file can't be opened
and allows virFileWrapperFdCatchError to be called with NULL instead.
This commit is contained in:
Ján Tomko 2012-11-28 15:59:07 +01:00 committed by Osier Yang
parent 0361917619
commit 7794e02c56
2 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/qemu/qemu_driver.c
View File

@ -2908,8 +2908,7 @@ qemuDomainSaveMemory(struct qemud_driver *driver,
cleanup: cleanup:
VIR_FORCE_CLOSE(fd); VIR_FORCE_CLOSE(fd);
if (wrapperFd) virFileWrapperFdCatchError(wrapperFd);
virFileWrapperFdCatchError(wrapperFd);
virFileWrapperFdFree(wrapperFd); virFileWrapperFdFree(wrapperFd);
VIR_FREE(xml); VIR_FREE(xml);
@ -3365,8 +3364,7 @@ doCoreDump(struct qemud_driver *driver,
cleanup: cleanup:
VIR_FORCE_CLOSE(fd); VIR_FORCE_CLOSE(fd);
if (ret != 0) { if (ret != 0) {
if (wrapperFd) virFileWrapperFdCatchError(wrapperFd);
virFileWrapperFdCatchError(wrapperFd);
unlink(path); unlink(path);
} }
virFileWrapperFdFree(wrapperFd); virFileWrapperFdFree(wrapperFd);

2
src/util/virfile.c
View File

@ -369,7 +369,7 @@ virFileWrapperFdClose(virFileWrapperFdPtr wfd)
void void
virFileWrapperFdCatchError(virFileWrapperFdPtr wfd) virFileWrapperFdCatchError(virFileWrapperFdPtr wfd)
{ {
if (wfd->err_msg) if (wfd && wfd->err_msg)
VIR_WARN("iohelper reports: %s", wfd->err_msg); VIR_WARN("iohelper reports: %s", wfd->err_msg);
} }