From: Zoltan Varga Date: Tue, 24 Apr 2007 19:52:06 +0000 (-0000) Subject: 2007-04-24 Zoltan Varga X-Git-Url: http://wien.tomnetworks.com/gitweb/?a=commitdiff_plain;h=7dafb2ce0b31ef3a0c39fabd5becc4a8b8881b9f;p=mono.git 2007-04-24 Zoltan Varga * reflection.c (mono_image_load_module_dynamic): Fix crash introduced by previous patch. svn path=/trunk/mono/; revision=76219 --- diff --git a/mono/metadata/ChangeLog b/mono/metadata/ChangeLog index 79a17f0d349..8813770423b 100644 --- a/mono/metadata/ChangeLog +++ b/mono/metadata/ChangeLog @@ -1,5 +1,8 @@ 2007-04-24 Zoltan Varga + * reflection.c (mono_image_load_module_dynamic): Fix crash introduced by previous + patch. + * image.c (mono_image_load_module): New API function to load a module reference. * image.c (load_modules): Load modules lazily. Fixes #80812. diff --git a/mono/metadata/reflection.c b/mono/metadata/reflection.c index cb013cb67e1..4c83055c088 100644 --- a/mono/metadata/reflection.c +++ b/mono/metadata/reflection.c @@ -5031,10 +5031,10 @@ mono_image_load_module_dynamic (MonoReflectionAssemblyBuilder *ab, MonoString *f new_modules = g_new0 (MonoImage *, module_count + 1); new_modules_loaded = g_new0 (gboolean, module_count + 1); - if (image->assembly->image->modules) { + if (image->assembly->image->modules) memcpy (new_modules, image->assembly->image->modules, module_count * sizeof (MonoImage *)); + if (image->assembly->image->modules_loaded) memcpy (new_modules_loaded, image->assembly->image->modules_loaded, module_count * sizeof (gboolean)); - } new_modules [module_count] = image; new_modules_loaded [module_count] = TRUE; mono_image_addref (image);