Merged revisions 192808 via svnmerge from

https://origsvn.digium.com/svn/asterisk/trunk

........
  r192808 | file | 2009-05-06 14:38:51 -0300 (Wed, 06 May 2009) | 10 lines

  Fix a bug where a timer would be created but not acknowledged.

  This scenario crept up if chan_iax2 was loaded with no configuration file present.
  It would create a timer and tell it to go at an interval but the thread that normally
  acknowledges it would not be created because no configuration file was present. The timer
  will now be closed if no configuration file is present.

  (closes issue #15014)
  Reported by: madkins
........

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

diff --git a/channels/chan_iax2.c b/channels/chan_iax2.c
index 3db78d3e0f0a8471f34cf6407553dc86cc3ad01a..38510edaeee4d15a66681b56585fc9cd66dbbb76 100644 (file)
--- a/channels/chan_iax2.c
+++ b/channels/chan_iax2.c
@@ -12473,6 +12473,9 @@ static int load_module(void)
        }
 
        if (set_config(config, 0) == -1) {
+               if (timer) {
+                       ast_timer_close(timer);
+               }
                return AST_MODULE_LOAD_DECLINE;
        }