Fix stringxx to call Unicode_Free() instead of free()

Signed-off-by: Dmitry Torokhov <dtor@vmware.com>

diff --git a/open-vm-tools/lib/include/unicodeBase.h b/open-vm-tools/lib/include/unicodeBase.h
index a8c8d1f9b0fda42d2066371857259a7db2efc425..473cc02cc709dbe9a47fd666af0b628c70f9af5a 100644 (file)
--- a/open-vm-tools/lib/include/unicodeBase.h
+++ b/open-vm-tools/lib/include/unicodeBase.h
@@ -172,7 +172,7 @@ Unicode_AllocWithUTF16(const utf16_t *utf16String) // IN
 
 
 Unicode Unicode_Duplicate(ConstUnicode str);
-void Unicode_Free(Unicode str);
+void Unicode_Free(void *str);
 
 
 Unicode *Unicode_AllocList(char **srcList, ssize_t length,

diff --git a/open-vm-tools/lib/unicode/unicodeSimpleBase.c b/open-vm-tools/lib/unicode/unicodeSimpleBase.c
index 8d7706037e69d2508917b541d7c57fe023b446d9..c0b4d0c58b4a0dca04a76895dd4fbca250e7739b 100644 (file)
--- a/open-vm-tools/lib/unicode/unicodeSimpleBase.c
+++ b/open-vm-tools/lib/unicode/unicodeSimpleBase.c
@@ -227,7 +227,7 @@ Unicode_Duplicate(ConstUnicode str) // IN
  */
 
 void
-Unicode_Free(Unicode str) // IN
+Unicode_Free(void *str) // IN
 {
    free(str);
 }

diff --git a/open-vm-tools/services/plugins/dndcp/stringxx/ubstr_t.hh b/open-vm-tools/services/plugins/dndcp/stringxx/ubstr_t.hh
index 955d1b6ee82310d0b61be9f348569eb307cafaf4..f477d58d0dcaa038ed18a78137ed731962f6d93b 100644 (file)
--- a/open-vm-tools/services/plugins/dndcp/stringxx/ubstr_t.hh
+++ b/open-vm-tools/services/plugins/dndcp/stringxx/ubstr_t.hh
@@ -133,7 +133,7 @@ private:
       // Takes ownership of the input string.
       void Set(char *utf8String) // IN/OUT: May be NULL.
       {
-         free(mUTF8String);
+         Unicode_Free(mUTF8String);
          mUTF8String = utf8String;
       }
 
@@ -146,7 +146,7 @@ private:
       // Only destructible via unreference().
       ~UTF8Data()
       {
-         free(mUTF8String);
+         Unicode_Free(mUTF8String);
       }
 
       char *mUTF8String;
@@ -256,9 +256,9 @@ ubstr_t::ubstr_t(const char *s) // IN: A UTF-8-encoded string.
       utf16_t *utf16Str = Unicode_GetAllocUTF16(s);
       try {
          mBstr = utf16Str;
-         free(utf16Str);
+         Unicode_Free(utf16Str);
       } catch (...) {
-         free(utf16Str);
+         Unicode_Free(utf16Str);
          throw;
       }
    }
@@ -843,7 +843,7 @@ ubstr_t::GetUTF8Cache()
          mUTF8->Set(utf8Str);
       }
    } catch (...) {
-      free(utf8Str);
+      Unicode_Free(utf8Str);
       throw;
    }