Use eglib g_* allocators rather than malloc/calloc (#5359)

diff --git a/mono/metadata/mono-config.c b/mono/metadata/mono-config.c
index e3d19ca7c130c3ef57cf87b841a6920a1712e55d..7ee7fe2e23a7fabca3e238729679264827738188 100644 (file)
--- a/mono/metadata/mono-config.c
+++ b/mono/metadata/mono-config.c
@@ -686,7 +686,7 @@ mono_set_config_dir (const char *dir)
        /* If this environment variable is set, overrides the directory computed */
        char *env_mono_cfg_dir = g_getenv ("MONO_CFG_DIR");
        if (env_mono_cfg_dir == NULL && dir != NULL)
-               env_mono_cfg_dir = strdup (dir);
+               env_mono_cfg_dir = g_strdup (dir);
 
        mono_cfg_dir = env_mono_cfg_dir;
 }

diff --git a/mono/metadata/object.c b/mono/metadata/object.c
index 3d3d68c8a1084a19699bea369f7b25ed57987945..45f261697b6243399776adc012750e770b441291 100644 (file)
--- a/mono/metadata/object.c
+++ b/mono/metadata/object.c
@@ -1148,7 +1148,7 @@ mono_method_get_imt_slot (MonoMethod *method)
 
        sig = mono_method_signature (method);
        hashes_count = sig->param_count + 4;
-       hashes_start = (guint32 *)malloc (hashes_count * sizeof (guint32));
+       hashes_start = (guint32 *)g_malloc (hashes_count * sizeof (guint32));
        hashes = hashes_start;
 
        if (! MONO_CLASS_IS_INTERFACE (method->klass)) {
@@ -1300,7 +1300,7 @@ imt_sort_slot_entries (MonoImtBuilderEntry *entries) {
        MONO_REQ_GC_NEUTRAL_MODE;
 
        int number_of_entries = entries->children + 1;
-       MonoImtBuilderEntry **sorted_array = (MonoImtBuilderEntry **)malloc (sizeof (MonoImtBuilderEntry*) * number_of_entries);
+       MonoImtBuilderEntry **sorted_array = (MonoImtBuilderEntry **)g_malloc (sizeof (MonoImtBuilderEntry*) * number_of_entries);
        GPtrArray *result = g_ptr_array_new ();
        MonoImtBuilderEntry *current_entry;
        int i;
@@ -1365,7 +1365,7 @@ build_imt_slots (MonoClass *klass, MonoVTable *vt, MonoDomain *domain, gpointer*
        int i;
        GSList *list_item;
        guint32 imt_collisions_bitmap = 0;
-       MonoImtBuilderEntry **imt_builder = (MonoImtBuilderEntry **)calloc (MONO_IMT_SIZE, sizeof (MonoImtBuilderEntry*));
+       MonoImtBuilderEntry **imt_builder = (MonoImtBuilderEntry **)g_calloc (MONO_IMT_SIZE, sizeof (MonoImtBuilderEntry*));
        int method_count = 0;
        gboolean record_method_count_for_max_collisions = FALSE;
        gboolean has_generic_virtual = FALSE, has_variant_iface = FALSE;