2010-05-29 Robert Jordan <robertj@gmx.net>

	* 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

diff --git a/mono/metadata/ChangeLog b/mono/metadata/ChangeLog
index e118e53b6d7780601d4de1f7fd6db74eefa47c6b..2008db857ede0605382bdb792845ee1977d2c16c 100644 (file)
--- a/mono/metadata/ChangeLog
+++ b/mono/metadata/ChangeLog
@@ -1,3 +1,9 @@
+2010-05-29  Robert Jordan  <robertj@gmx.net>
+
+       * 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  <mark.probst@gmail.com>
 
        * sgen-gc.c: Change default nursery size to 4MB, because it

diff --git a/mono/metadata/marshal.c b/mono/metadata/marshal.c
index 5c26ede4e0873ef449215dc6dd819aa388334eff..bc58e2fb57063ba81265a0b15047386d5e52bc84 100644 (file)
--- 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);