Merge pull request #3948 from henricm/fix-pinvoke-utf8-windows

[mono.git] / mono / tests / libtest.c

diff --git a/mono/tests/libtest.c b/mono/tests/libtest.c
index f65b779e2838eeb9176ce9847f90802e268cbdf1..3b0d98c37c81207db3d43c1683278182a8a31611 100644 (file)
--- a/mono/tests/libtest.c
+++ b/mono/tests/libtest.c
@@ -7250,7 +7250,7 @@ build_return_string(const char* pReturn)
                return ret;
 
        size_t strLength = strlen(pReturn);
-       ret = (char *)(malloc(sizeof(char)* (strLength + 1)));
+       ret = (char *)(marshal_alloc (sizeof(char)* (strLength + 1)));
        memset(ret, '\0', strLength + 1);
        strncpy(ret, pReturn, strLength);
        return ret;
@@ -7268,7 +7268,7 @@ StringParameterRefOut(/*out*/ char **s, int index)
 {
        char *pszTextutf8 = (char*)utf8Strings[index];
        size_t strLength = strlen(pszTextutf8);
-       *s = (char *)(malloc(sizeof(char)* (strLength + 1)));
+       *s = (char *)(marshal_alloc (sizeof(char)* (strLength + 1)));
        memcpy(*s, pszTextutf8, strLength);
        (*s)[strLength] = '\0';
 }
@@ -7291,10 +7291,10 @@ StringParameterRef(/*ref*/ char **s, int index)
 
     if (*s)
     {
-       free(*s);
+       marshal_free (*s);
     }
     // overwrite the orginal 
-    *s = (char *)(malloc(sizeof(char)* (strLength + 1)));
+    *s = (char *)(marshal_alloc (sizeof(char)* (strLength + 1)));
     memcpy(*s, pszTextutf8, strLength);
     (*s)[strLength] = '\0';
 }
@@ -7401,7 +7401,7 @@ StringBuilderParameterReturn(int index)
 {
     char *pszTextutf8 = (char*)utf8Strings[index];
     size_t strLength = strlen(pszTextutf8);
-    char * ret = (char *)(malloc(sizeof(char)* (strLength + 1)));
+    char * ret = (char *)(marshal_alloc (sizeof(char)* (strLength + 1)));
     memcpy(ret, pszTextutf8, strLength);
     ret[strLength] = '\0';