Skip to content
Extraits de code Groupes Projets

Resolve "BUG: segfault when the module specified in the config is not present"

Fusionnées Kubat a demandé de fusionner 108-segfault-in-gdb vers master
1 file
+ 4
5
Comparer les modifications
  • Côte à côte
  • En ligne
+ 4
5
@@ -75,10 +75,9 @@ reg_import(const char *mod, struct module_reg **ret, void **handle)
@@ -75,10 +75,9 @@ reg_import(const char *mod, struct module_reg **ret, void **handle)
LOG_INFO("REG", "Using the reg structure to find %s", mod);
LOG_INFO("REG", "Using the reg structure to find %s", mod);
*ret = reg_internal_get(__reg__, mod);
*ret = reg_internal_get(__reg__, mod);
if (!*ret) {
if (!*ret) {
LOG_INFO("REG",
LOG_FATAL("The module %s was not found by using the reg '" REG_EXPORT_NAME "' or by "
"Not found in reg '" REG_EXPORT_NAME "', "
"using dlsym to find reg '" REG_EXPORT_NAME "' in file %s",
"using the dlsym to find reg '" REG_EXPORT_NAME "' in file %s",
mod);
mod);
}
}
}
}
return *ret != NULL;
return *ret != NULL;
@@ -89,7 +88,7 @@ reg_call(struct module_reg *reg, const char *name, int count, ...)
@@ -89,7 +88,7 @@ reg_call(struct module_reg *reg, const char *name, int count, ...)
{
{
reg_func func = reg_internal_func(reg, name);
reg_func func = reg_internal_func(reg, name);
if (!func) {
if (!func) {
LOG_ERROR("REG", "No function named '%s'", name);
LOG_ERROR("REG", "No function named '%s' in reg: %s", name, reg->name);
return 2;
return 2;
}
}
va_list va;
va_list va;
Chargement en cours