From 4fcd73dcb4046e1343dfc0976bd196435e3331f3 Mon Sep 17 00:00:00 2001 From: Robert Jordan Date: Fri, 28 May 2010 22:05:52 +0000 Subject: [PATCH] 2010-05-29 Robert Jordan * marshal.c (mono_marshal_asany): marshal LPWSTRs using mono_marshal_string_to_utf16_copy () to avoid memory allocation mismatches under Windows. Fixes pinvoke2:test_0_asany. svn path=/trunk/mono/; revision=158126 --- mono/metadata/ChangeLog | 6 ++++++ mono/metadata/marshal.c | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/mono/metadata/ChangeLog b/mono/metadata/ChangeLog index e118e53b6d7..2008db857ed 100644 --- a/mono/metadata/ChangeLog +++ b/mono/metadata/ChangeLog @@ -1,3 +1,9 @@ +2010-05-29 Robert Jordan + + * marshal.c (mono_marshal_asany): marshal LPWSTRs using + mono_marshal_string_to_utf16_copy () to avoid memory allocation + mismatches under Windows. Fixes pinvoke2:test_0_asany. + 2010-05-28 Mark Probst * sgen-gc.c: Change default nursery size to 4MB, because it diff --git a/mono/metadata/marshal.c b/mono/metadata/marshal.c index 5c26ede4e08..bc58e2fb570 100644 --- a/mono/metadata/marshal.c +++ b/mono/metadata/marshal.c @@ -10702,7 +10702,7 @@ mono_marshal_asany (MonoObject *o, MonoMarshalNative string_encoding, int param_ case MONO_TYPE_STRING: switch (string_encoding) { case MONO_NATIVE_LPWSTR: - return mono_string_to_utf16 ((MonoString*)o); + return mono_marshal_string_to_utf16_copy ((MonoString*)o); break; case MONO_NATIVE_LPSTR: return mono_string_to_lpstr ((MonoString*)o); -- 2.25.1