From: Katy Feng <fkaty@vmware.com>
Date: Thu, 23 Feb 2023 19:27:13 +0000 (-0800)
Subject: Change to common source file not applicable to open-vm-tools.
X-Git-Tag: stable-12.3.0~116
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=62b3b42fa69fc7a7fc8fdda9d1a8cd158244c819;p=thirdparty%2Fopen-vm-tools.git

Change to common source file not applicable to open-vm-tools.
---

diff --git a/open-vm-tools/lib/file/fileLockPrimitive.c b/open-vm-tools/lib/file/fileLockPrimitive.c
index 374bf80e6..ce81d67ed 100644
--- a/open-vm-tools/lib/file/fileLockPrimitive.c
+++ b/open-vm-tools/lib/file/fileLockPrimitive.c
@@ -753,8 +753,10 @@ FileLockScanDirectory(const char *lockDir,      // IN:
    /* Pass 2: Handle the 'M' entries */
    for (i = 0, err = 0; i < numEntries; i++) {
       LockValues *ptr;
-      Bool       myLockFile;
+      Bool myLockFile;
       LockValues memberValues;
+      char buffer[FILELOCK_DATA_SIZE];  // Must be near memberValues,
+                                        // as it will be pointed by it
 
       if ((fileList[i] == NULL) || (*fileList[i] == 'E')) {
          continue;
@@ -767,7 +769,6 @@ FileLockScanDirectory(const char *lockDir,      // IN:
          /* It's me! No need to read or validate anything. */
          ptr = myValues;
       } else {
-         char buffer[FILELOCK_DATA_SIZE];
          /* It's not me! Attempt to extract the member values. */
          err = FileLockMemberValues(lockDir, fileList[i], buffer,
                                     FILELOCK_DATA_SIZE, &memberValues);