From: Oliver Kurth <okurth@vmware.com>
Date: Wed, 29 Aug 2018 20:29:45 +0000 (-0700)
Subject: lib/file: FileIO_CloseAndUnlink
X-Git-Tag: stable-11.0.0~429
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c3461876464b93bcd65cca2a01767ffae0bf9ef3;p=thirdparty%2Fopen-vm-tools.git

lib/file: FileIO_CloseAndUnlink

Unlink regardless of the close status.
---

diff --git a/open-vm-tools/lib/file/fileIO.c b/open-vm-tools/lib/file/fileIO.c
index 77ffc0127..2eaf36a7e 100644
--- a/open-vm-tools/lib/file/fileIO.c
+++ b/open-vm-tools/lib/file/fileIO.c
@@ -524,10 +524,8 @@ FileIO_CloseAndUnlink(FileIODescriptor *fd)  // IN:
    path = Unicode_Duplicate(fd->fileName);
 
    ret = FileIO_Close(fd);
-   if (FileIO_IsSuccess(ret)) {
-      if (File_UnlinkIfExists(path) == -1) {
-         ret = FILEIO_ERROR;
-      }
+   if ((File_UnlinkIfExists(path) == -1) && FileIO_IsSuccess(ret)) {
+      ret = FILEIO_ERROR;
    }
 
    Posix_Free(path);