]> git.ipfire.org Git - thirdparty/asterisk.git/commitdiff
Merged revisions 252623 via svnmerge from
authorSean Bright <sean@malleable.com>
Mon, 15 Mar 2010 21:59:38 +0000 (21:59 +0000)
committerSean Bright <sean@malleable.com>
Mon, 15 Mar 2010 21:59:38 +0000 (21:59 +0000)
https://origsvn.digium.com/svn/asterisk/trunk

........
  r252623 | seanbright | 2010-03-15 17:55:44 -0400 (Mon, 15 Mar 2010) | 4 lines

  Resolve a crash in SLATrunk when the specified trunk doesn't exist.

  Reported by philipp64 in #asterisk-dev.
........

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

apps/app_meetme.c

index 8bc2f542dcc21dac7edde8cc646b49becdae1b4f..f2c2aff869cbffece4b98b9dd764b8237d4d2a8e 100644 (file)
@@ -5241,7 +5241,6 @@ static int sla_trunk_exec(struct ast_channel *chan, void *data)
        if (!trunk) {
                ast_log(LOG_ERROR, "SLA Trunk '%s' not found!\n", args.trunk_name);
                pbx_builtin_setvar_helper(chan, "SLATRUNK_STATUS", "FAILURE");
-               ast_atomic_fetchadd_int((int *) &trunk->ref_count, -1);
                sla_queue_event(SLA_EVENT_CHECK_RELOAD);        
                return 0;
        }