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: https://origsvn.digium.com/svn/asterisk/branches/1.6.2@276442 65c4cc65-6c06-0410-ace0-fbb531ad65f3

diff --git a/main/loader.c b/main/loader.c
index f5b737d845d48b995712f5f812a4762a9499c8f8..34ae3b791339de2aaa0832dc2665b63472a2cf0e 100644 (file)
--- 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;
        }