Author: zoltan
Date: 2006-01-18 08:50:52 -0500 (Wed, 18 Jan 2006)
New Revision: 55719
Modified:
branches/mono-1-1-13/mono/mono/metadata/ChangeLog
branches/mono-1-1-13/mono/mono/metadata/metadata.c
Log:
Merge from HEAD.
Modified: branches/mono-1-1-13/mono/mono/metadata/ChangeLog
===================================================================
--- branches/mono-1-1-13/mono/mono/metadata/ChangeLog 2006-01-18 13:49:40 UTC
(rev 55718)
+++ branches/mono-1-1-13/mono/mono/metadata/ChangeLog 2006-01-18 13:50:52 UTC
(rev 55719)
@@ -1,3 +1,9 @@
+2006-01-18 Zoltan Varga <[EMAIL PROTECTED]>
+
+ * metadata.c (mono_metadata_signature_dup): Applied patch from
+ Aras Pranckevicius ([EMAIL PROTECTED]). Fix crash when compiled with
MSVC.
+ Fixes #77288.
+
2006-01-17 Zoltan Varga <[EMAIL PROTECTED]>
* marshal.c (emit_struct_conv): Allow fields with the same offset when
Modified: branches/mono-1-1-13/mono/mono/metadata/metadata.c
===================================================================
--- branches/mono-1-1-13/mono/mono/metadata/metadata.c 2006-01-18 13:49:40 UTC
(rev 55718)
+++ branches/mono-1-1-13/mono/mono/metadata/metadata.c 2006-01-18 13:50:52 UTC
(rev 55719)
@@ -1518,7 +1518,7 @@
{
int sigsize;
- sigsize = sizeof (MonoMethodSignature) + sig->param_count * sizeof
(MonoType *);
+ sigsize = sizeof (MonoMethodSignature) + (sig->param_count -
MONO_ZERO_LEN_ARRAY) * sizeof (MonoType *);
return g_memdup (sig, sigsize);
}
_______________________________________________
Mono-patches maillist - [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches