From: Kevin P. Fleming <kpfleming@digium.com>
Date: Wed, 14 Jul 2010 20:16:28 +0000 (+0000)
Subject: Merged revisions 276441 via svnmerge from
X-Git-Tag: 1.6.2.11-rc1~29
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=77ad0e2e027aa9f2ef9da5f0c40d77a0950f16e5;p=thirdparty%2Fasterisk.git

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 f5b737d845..34ae3b7913 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;
 	}