Skip to content
Snippets Groups Projects
Commit 1f46755f authored by Luigi Rizzo's avatar Luigi Rizzo
Browse files

fix a mostly harmless error introduced by svn merge.


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@20036 65c4cc65-6c06-0410-ace0-fbb531ad65f3
parent b433dc19
No related branches found
No related tags found
No related merge requests found
......@@ -704,13 +704,11 @@ static struct module * __load_resource(const char *resource_name,
/* open in a sane way */
cur->lib = dlopen(fn, RTLD_NOW | RTLD_LOCAL);
if (cur->lib) {
if ((m = find_symbol(cur, "mod_data", 0)) == NULL ||
(m->flags & MOD_MASK) == MOD_0) {
if (cur->lib &&
((m = find_symbol(cur, "mod_data", 0)) == NULL || (m->flags & MOD_MASK) == MOD_0)) {
/* old-style module, close and reload with standard flags */
dlclose(cur->lib);
cur->lib = NULL;
}
dlclose(cur->lib);
cur->lib = NULL;
m = NULL;
}
if (cur->lib == NULL) /* try reopen with the old style */
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment