diff options
| author | crichter <crichter@f38db490-d61c-443f-a65b-d21fe96a405b> | 2006-10-22 21:44:46 +0000 |
|---|---|---|
| committer | crichter <crichter@f38db490-d61c-443f-a65b-d21fe96a405b> | 2006-10-22 21:44:46 +0000 |
| commit | b480598e6f53ce67ce913ef8156cd4dbd3b26d4f (patch) | |
| tree | db6d2d63d7da3ac4e78e13605993bc703c92ed04 | |
| parent | 64ad5150fe2898b8175241decda2952020276ffd (diff) | |
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.
........
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.4@45916 f38db490-d61c-443f-a65b-d21fe96a405b
| -rw-r--r-- | channels/chan_misdn.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/channels/chan_misdn.c b/channels/chan_misdn.c index 4e14cdfe7..d9f10f86b 100644 --- a/channels/chan_misdn.c +++ b/channels/chan_misdn.c @@ -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) { |