projects
/
mono.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge pull request #4102 from marek-safar/bootstrap
[mono.git]
/
mono
/
utils
/
mono-dl.c
diff --git
a/mono/utils/mono-dl.c
b/mono/utils/mono-dl.c
index 43116130309eec7195e24a87f8d39e10e544dbce..6c0f582cf6d1ddc170d86bf4f6fb40374138525a 100644
(file)
--- a/
mono/utils/mono-dl.c
+++ b/
mono/utils/mono-dl.c
@@
-140,7
+140,7
@@
mono_dl_open (const char *name, int flags, char **error_msg)
if (error_msg)
*error_msg = NULL;
if (error_msg)
*error_msg = NULL;
- module = (MonoDl *) malloc (sizeof (MonoDl));
+ module = (MonoDl *)
g_
malloc (sizeof (MonoDl));
if (!module) {
if (error_msg)
*error_msg = g_strdup ("Out of memory");
if (!module) {
if (error_msg)
*error_msg = g_strdup ("Out of memory");
@@
-174,7
+174,7
@@
mono_dl_open (const char *name, int flags, char **error_msg)
const char *ext;
/* This platform does not support dlopen */
if (name == NULL) {
const char *ext;
/* This platform does not support dlopen */
if (name == NULL) {
- free (module);
+
g_
free (module);
return NULL;
}
return NULL;
}
@@
-193,7
+193,7
@@
mono_dl_open (const char *name, int flags, char **error_msg)
if (error_msg) {
*error_msg = mono_dl_current_error_string ();
}
if (error_msg) {
*error_msg = mono_dl_current_error_string ();
}
- free (module);
+
g_
free (module);
return NULL;
}
}
return NULL;
}
}
@@
-224,11
+224,11
@@
mono_dl_symbol (MonoDl *module, const char *name, void **symbol)
} else {
#if MONO_DL_NEED_USCORE
{
} else {
#if MONO_DL_NEED_USCORE
{
- char *usname = malloc (strlen (name) + 2);
+ char *usname =
g_
malloc (strlen (name) + 2);
*usname = '_';
strcpy (usname + 1, name);
sym = mono_dl_lookup_symbol (module, usname);
*usname = '_';
strcpy (usname + 1, name);
sym = mono_dl_lookup_symbol (module, usname);
- free (usname);
+
g_
free (usname);
}
#else
sym = mono_dl_lookup_symbol (module, name);
}
#else
sym = mono_dl_lookup_symbol (module, name);
@@
-264,7
+264,7
@@
mono_dl_close (MonoDl *module)
} else
mono_dl_close_handle (module);
} else
mono_dl_close_handle (module);
- free (module);
+
g_
free (module);
}
/**
}
/**