From: Sean Bright <sean@malleable.com>
Date: Mon, 15 Mar 2010 21:59:40 +0000 (+0000)
Subject: Merged revisions 252623 via svnmerge from
X-Git-Tag: 1.6.1.19-rc1~42
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=47f304f231a2e39f95f2ff41f0610ff4a94442fb;p=thirdparty%2Fasterisk.git

Merged revisions 252623 via svnmerge from
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.1@252625 65c4cc65-6c06-0410-ace0-fbb531ad65f3
---

diff --git a/apps/app_meetme.c b/apps/app_meetme.c
index bd906dfb26..3fc48b0306 100644
--- a/apps/app_meetme.c
+++ b/apps/app_meetme.c
@@ -5299,7 +5299,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;
 	}