Commit ea151222 authored by Matthias Clasen's avatar Matthias Clasen Committed by Matthias Clasen

Handle valid symbols that are NULL correctly. (#385388, Felix Kater)

2006-12-13  Matthias Clasen  <mclasen@redhat.com>

        * gmodule.c (g_module_open):
        * gmodule-dl.c (_g_module_symbol): Handle valid symbols
        that are NULL correctly.  (#385388, Felix Kater)
parent caecf2dd
2006-12-13 Matthias Clasen <mclasen@redhat.com>
* glib/tmpl/modules.sgml: Point out that valid symbols may be NULL.
2006-10-08 Matthias Clasen <mclasen@redhat.com>
* glib/tmpl/unicode.sgml: Document GUnicodeType.
......
......@@ -71,6 +71,22 @@ just_say_hello (const char *filename, GError **error)
return FALSE;
}
if (say_hello == NULL)
{
g_set_error (error, SAY_ERROR, SAY_ERROR_OPEN, "symbol say_hello is NULL");
if (!g_module_close (module))
g_warning ("&percnt;s: &percnt;s", filename, g_module_error (<!-- -->));
return FALSE;
}
if (say_hello == NULL)
{
g_set_error (error, SAY_ERROR, SAY_ERROR_OPEN, "symbol say_hello is NULL");
if (!g_module_close (module))
g_warning ("&percnt;s: &percnt;s", filename, g_module_error (<!-- -->));
return FALSE;
}
/* call our function in the module */
say_hello ("Hello world!");
......@@ -177,6 +193,12 @@ not supported on all platforms.
<para>
Gets a symbol pointer from a module.
</para>
<para>
Note that a valid symbol can be %NULL.
</para>
<para>
Note that a valid symbol can be %NULL.
</para>
@module: a #GModule.
@symbol_name: the name of the symbol to find.
......
2006-12-13 Matthias Clasen <mclasen@redhat.com>
* gmodule.c (g_module_open):
* gmodule-dl.c (_g_module_symbol): Handle valid symbols
that are NULL correctly. (#385388, Felix Kater)
Mon Sep 11 14:58:56 2006 Tim Janik <timj@imendio.com>
* gmodule.c: applied patch from Christian Persch to support
......
......@@ -96,7 +96,7 @@ _g_module_open (const gchar *file_name,
gpointer handle;
handle = dlopen (file_name,
(bind_local ? 0 : RTLD_GLOBAL) | (bind_lazy ? RTLD_LAZY : RTLD_NOW));
(bind_local ? 0 : RTLD_GLOBAL) | (bind_lazy ? RTLD_LAZY : RTLD_NOW));
if (!handle)
g_module_set_error (fetch_dlerror (TRUE));
......@@ -140,10 +140,13 @@ _g_module_symbol (gpointer handle,
const gchar *symbol_name)
{
gpointer p;
gchar *msg;
fetch_dlerror (FALSE);
p = dlsym (handle, symbol_name);
if (!p)
g_module_set_error (fetch_dlerror (FALSE));
msg = fetch_dlerror (FALSE);
if (msg)
g_module_set_error (msg);
return p;
}
......
......@@ -477,7 +477,7 @@ g_module_open (const gchar *file_name,
modules = module;
/* check initialization */
if (g_module_symbol (module, "g_module_check_init", (gpointer) &check_init))
if (g_module_symbol (module, "g_module_check_init", (gpointer) &check_init) && check_init != NULL)
check_failed = check_init (module);
/* we don't call unload() if the initialization check failed. */
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment