From 1f46755f75f9335284417f9ddb8468382c9a7843 Mon Sep 17 00:00:00 2001
From: Luigi Rizzo <rizzo@icir.org>
Date: Fri, 14 Apr 2006 17:19:57 +0000
Subject: [PATCH] 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
---
loader.c | 10 ++++------
1 file changed, 4 insertions(+), 6 deletions(-)
diff --git a/loader.c b/loader.c
index d6a0496cc3..5e230db50c 100644
--- a/loader.c
+++ b/loader.c
@@ -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 */
--
GitLab