From: John Wolfe <jwolfe@vmware.com>
Date: Fri, 20 Nov 2020 16:37:30 +0000 (-0800)
Subject: Common source file change not applicable to open-vm-tools.
X-Git-Tag: stable-11.3.0~232
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b8d8c9f706558372d19edaa8c3a1ad4518960cd9;p=thirdparty%2Fopen-vm-tools.git

Common source file change not applicable to open-vm-tools.
---

diff --git a/open-vm-tools/lib/unicode/unicodeSimpleTypes.c b/open-vm-tools/lib/unicode/unicodeSimpleTypes.c
index 59811093d..3fa635c98 100644
--- a/open-vm-tools/lib/unicode/unicodeSimpleTypes.c
+++ b/open-vm-tools/lib/unicode/unicodeSimpleTypes.c
@@ -2943,6 +2943,8 @@ Unicode_Shutdown(int argc,              // IN
    HashTable_FreeUnsafe(unicodeEncCache);
    unicodeEncCache = NULL;
 
+   // Please refer to comments in UnicodeInitInternal
+#if !defined(__APPLE__) && !defined(VMX86_SERVER)
    if (argv != NULL) {
       Util_FreeStringList(argv, argc + 1);
    }
@@ -2950,6 +2952,7 @@ Unicode_Shutdown(int argc,              // IN
    if (envp != NULL) {
       Util_FreeStringList(envp, -1);
    }
+#endif
 }