Author: zoltan
Date: 2006-06-28 13:00:43 -0400 (Wed, 28 Jun 2006)
New Revision: 62119
Modified:
trunk/mono/mono/metadata/ChangeLog
trunk/mono/mono/metadata/marshal.c
Log:
2006-06-28 Zoltan Varga <[EMAIL PROTECTED]>
* marshal.c (mono_string_to_byvalwstr): Fix this completely broken
function.
Fixes #78722.
Modified: trunk/mono/mono/metadata/ChangeLog
===================================================================
--- trunk/mono/mono/metadata/ChangeLog 2006-06-28 16:54:36 UTC (rev 62118)
+++ trunk/mono/mono/metadata/ChangeLog 2006-06-28 17:00:43 UTC (rev 62119)
@@ -1,3 +1,8 @@
+2006-06-28 Zoltan Varga <[EMAIL PROTECTED]>
+
+ * marshal.c (mono_string_to_byvalwstr): Fix this completely broken
function.
+ Fixes #78722.
+
2006-06-21 Martin Baulig <[EMAIL PROTECTED]>
* reflection.c
Modified: trunk/mono/mono/metadata/marshal.c
===================================================================
--- trunk/mono/mono/metadata/marshal.c 2006-06-28 16:54:36 UTC (rev 62118)
+++ trunk/mono/mono/metadata/marshal.c 2006-06-28 17:00:43 UTC (rev 62119)
@@ -704,15 +704,14 @@
g_assert (size > 1);
if (!src) {
- memset (dst, 0, size);
+ memset (dst, 0, size * 2);
return;
}
- len = MIN (size, (mono_string_length (src) * 2));
- memcpy (dst, mono_string_chars (src), len);
+ len = MIN (size, (mono_string_length (src)));
+ memcpy (dst, mono_string_chars (src), len * 2);
- *((char *)dst + size - 1) = 0;
- *((char *)dst + size - 2) = 0;
+ *((gunichar2 *)dst + len - 1) = 0;
}
void
_______________________________________________
Mono-patches maillist - [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches
