Fix crash in Process.GetModules_internal() on Windows after refactorings

EnumProcessModules() is called incorrectly. Also fixes a missing curly braces
pair.

diff --git a/mono/metadata/w32process.c b/mono/metadata/w32process.c
index dfc9578ca59c94f58c7744fe786eee69f57ab73d..614168ed5873dd3a486656513b5c2dfb2b87f41f 100644 (file)
--- a/mono/metadata/w32process.c
+++ b/mono/metadata/w32process.c
@@ -25,7 +25,7 @@ mono_w32process_get_pid (gpointer handle)
 static gboolean
 mono_w32process_try_get_modules (gpointer process, gpointer *modules, guint32 size, guint32 *needed)
 {
-       return EnumProcessModules (process, modules, size, &needed);
+       return EnumProcessModules (process, (HMODULE *) modules, size, (LPDWORD) needed);
 }
 
 static guint32
@@ -525,9 +525,10 @@ ves_icall_System_Diagnostics_Process_GetModules_internal (MonoObject *this_obj,
 
        stash_system_image (mono_object_class (this_obj)->image);
 
-       if (mono_w32process_get_pid (process) == mono_process_current_pid ())
+       if (mono_w32process_get_pid (process) == mono_process_current_pid ()) {
                assemblies = get_domain_assemblies (mono_domain_get ());
                assembly_count = assemblies->len;
+       }
 
        if (mono_w32process_try_get_modules (process, mods, sizeof(mods), &needed))
                module_count += needed / sizeof(HMODULE);