]> git.ipfire.org Git - thirdparty/asterisk.git/commitdiff
Merged revisions 45808 via svnmerge from
authorChristian Richter <christian.richter@beronet.com>
Sun, 22 Oct 2006 21:44:46 +0000 (21:44 +0000)
committerChristian Richter <christian.richter@beronet.com>
Sun, 22 Oct 2006 21:44:46 +0000 (21:44 +0000)
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.
........

git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.4@45916 65c4cc65-6c06-0410-ace0-fbb531ad65f3

channels/chan_misdn.c

index 4e14cdfe7d728c6ed9c349f89d3cf201cf14573e..d9f10f86bcc6a1ce31fbda4120e0252773079dd3 100644 (file)
@@ -78,6 +78,7 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 
 char global_tracefile[BUFFERSIZE+1];
 
+static int g_config_initialized=0;
 
 struct misdn_jb{
        int size;
@@ -956,6 +957,11 @@ static char *misdn_get_ch_state(struct chan_list *p)
 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();
@@ -4530,7 +4536,6 @@ cb_events(enum event_e event, struct misdn_bchannel *bc, void *user_data)
  *******************************************/
 
 
-static int g_config_initialized=0;
 
 static int unload_module(void)
 {