From: VMware, Inc <>
Date: Tue, 24 Aug 2010 18:25:35 +0000 (-0700)
Subject: Call FileIO_Invalidate() before FileIO_Open()
X-Git-Tag: 2010.08.24-292196~44
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8b06403cc797d269b96eae1845b29595a0275ee1;p=thirdparty%2Fopen-vm-tools.git

Call FileIO_Invalidate() before FileIO_Open()

We need to call FileIO_Invalidate() before calling FileIO_Open().
Otherwise FileIO_Open() ASSERTS on obj and beta builds.

Signed-off-by: Marcelo Vanzin <mvanzin@vmware.com>
---

diff --git a/open-vm-tools/lib/procMgr/procMgrSolaris.c b/open-vm-tools/lib/procMgr/procMgrSolaris.c
index f1cf18eb5..f387a9b0d 100644
--- a/open-vm-tools/lib/procMgr/procMgrSolaris.c
+++ b/open-vm-tools/lib/procMgr/procMgrSolaris.c
@@ -122,6 +122,8 @@ ProcMgr_ListProcesses(void)
       FileIOResult res;
 
       errno = 0;
+      FileIO_Invalidate(&psInfoFd);
+
       ent = readdir(dir);
       if (ent == NULL) {
          if (errno == 0) {
@@ -288,7 +290,9 @@ ExtractCommandLineFromAddressSpaceFile(psinfo_t *procInfo) //IN: psinfo struct
    DynBufArray args;
    pid_t pid;
 
+   FileIO_Invalidate(&asFd);
    pid = procInfo->pr_pid;
+
    if (Str_Snprintf(tempPath,
                 sizeof tempPath,
                 "/proc/%"FMT64"d/as",