[svn-commits] kpfleming: branch 1.6.2 r276442 - in /branches/1.6.2: ./ main/loader.c

[SVN commits to the Digium repositories]

Author: kpfleming
Date: Wed Jul 14 15:16:28 2010
New Revision: 276442

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=276442
Log:
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.
........

Modified:
    branches/1.6.2/   (props changed)
    branches/1.6.2/main/loader.c

Propchange: branches/1.6.2/
------------------------------------------------------------------------------
Binary property 'trunk-merged' - no diff available.

Modified: branches/1.6.2/main/loader.c
URL: http://svnview.digium.com/svn/asterisk/branches/1.6.2/main/loader.c?view=diff&rev=276442&r1=276441&r2=276442
==============================================================================
--- branches/1.6.2/main/loader.c (original)
+++ branches/1.6.2/main/loader.c Wed Jul 14 15:16:28 2010
@@ -814,7 +814,7 @@
 		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;
 	}