From 460f8443eb8da8dbabd23752ed8a0f27369eec5a Mon Sep 17 00:00:00 2001 From: zoltan Date: Fri, 16 Apr 2010 20:23:50 +0000 Subject: [PATCH] 2010-04-16 Zoltan Varga * marshal.c (mono_marshal_get_native_func_wrapper): Set the marshal info to NULL, since it is not a MonoMethod. git-svn-id: svn+ssh://mono-cvs.ximian.com/source/trunk/mono@155658 e3ebcda4-bce8-0310-ba0a-eca2169e7518 --- mono/metadata/ChangeLog | 5 +++++ mono/metadata/marshal.c | 2 ++ 2 files changed, 7 insertions(+) diff --git a/mono/metadata/ChangeLog b/mono/metadata/ChangeLog index dd0fa0f61..f68f026eb 100644 --- a/mono/metadata/ChangeLog +++ b/mono/metadata/ChangeLog @@ -1,3 +1,8 @@ +2010-04-16 Zoltan Varga + + * marshal.c (mono_marshal_get_native_func_wrapper): Set the marshal info to NULL, + since it is not a MonoMethod. + 2010-04-16 Sebastien Pouliot * icall-def.h: Add get_RequiresElevatedPermissions icall to diff --git a/mono/metadata/marshal.c b/mono/metadata/marshal.c index 277fe2f57..ab56fa8f9 100644 --- a/mono/metadata/marshal.c +++ b/mono/metadata/marshal.c @@ -8294,6 +8294,8 @@ mono_marshal_get_native_func_wrapper (MonoImage *image, MonoMethodSignature *sig mb, csig, csig->param_count + 16); mono_mb_free (mb); + mono_marshal_set_wrapper_info (res, NULL); + /* code_for (res); */ return res; -- 2.11.4.GIT