diff options
| author | kpfleming <kpfleming@f38db490-d61c-443f-a65b-d21fe96a405b> | 2010-07-14 20:16:28 +0000 |
|---|---|---|
| committer | kpfleming <kpfleming@f38db490-d61c-443f-a65b-d21fe96a405b> | 2010-07-14 20:16:28 +0000 |
| commit | 925d4efe528bd334d26ac11cd0685ca41c3ae441 (patch) | |
| tree | 2ad92910d1762985e7510372981d0cb729d39eb4 | |
| parent | 0f3f990d74568f2f7738b0ee8b6bedd2b150d369 (diff) | |
Merged revisions 276441 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk
........
r276441 | kpfleming | 2010-07-14 15:15:48 -0500 (Wed, 14 Jul 2010) | 4 lines
Don't try to call an embedded module's backup_globals() function until
after confirming it exists.
........
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.2@276442 f38db490-d61c-443f-a65b-d21fe96a405b
| -rw-r--r-- | main/loader.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/main/loader.c b/main/loader.c index f5b737d84..34ae3b791 100644 --- a/main/loader.c +++ b/main/loader.c @@ -814,7 +814,7 @@ static enum ast_module_load_result load_resource(const char *resource_name, unsi return AST_MODULE_LOAD_DECLINE; } - if (!mod->lib && mod->info->backup_globals()) { + if (!mod->lib && mod->info->backup_globals && mod->info->backup_globals()) { ast_log(LOG_WARNING, "Module '%s' was unable to backup its global data.\n", resource_name); return AST_MODULE_LOAD_DECLINE; } |