[svn-commits] crichter: trunk r45917 - in /trunk: ./ channels/chan_misdn.c

[svn-commits at lists.digium.com]

Author: crichter
Date: Sun Oct 22 16:57:11 2006
New Revision: 45917

URL: http://svn.digium.com/view/asterisk?rev=45917&view=rev
Log:
Merged revisions 45916 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.4

................
r45916 | crichter | 2006-10-22 23:44:46 +0200 (Sun, 22 Oct 2006) | 9 lines

Merged revisions 45808 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.2

........
r45808 | crichter | 2006-10-21 14:35:13 +0200 (Sat, 21 Oct 2006) | 1 line

fixed issue, that if chan_misdn is loaded and couldn't be initialized it would cause a segfault after 'reload'. Reported by Drew/Matt thx.
........

................

Modified:
    trunk/   (props changed)
    trunk/channels/chan_misdn.c

Propchange: trunk/
------------------------------------------------------------------------------
Binary property 'branch-1.4-merged' - no diff available.

Modified: trunk/channels/chan_misdn.c
URL: http://svn.digium.com/view/asterisk/trunk/channels/chan_misdn.c?rev=45917&r1=45916&r2=45917&view=diff
==============================================================================
--- trunk/channels/chan_misdn.c (original)
+++ trunk/channels/chan_misdn.c Sun Oct 22 16:57:11 2006
@@ -78,6 +78,7 @@
 
 char global_tracefile[BUFFERSIZE+1];
 
+static int g_config_initialized=0;
 
 struct misdn_jb{
 	int size;
@@ -955,6 +956,11 @@
 static void reload_config(void)
 {
 	int i, cfg_debug;
+
+	if (!g_config_initialized) {
+		ast_log(LOG_WARNING, "chan_misdn is not initialized properly, still reloading ?\n");
+		return ;
+	}
 	
 	free_robin_list();
 	misdn_cfg_reload();
@@ -4536,7 +4542,6 @@
  *******************************************/
 
 
-static int g_config_initialized=0;
 
 static int unload_module(void)
 {