diff options
| author | seanbright <seanbright@f38db490-d61c-443f-a65b-d21fe96a405b> | 2010-03-15 21:59:38 +0000 |
|---|---|---|
| committer | seanbright <seanbright@f38db490-d61c-443f-a65b-d21fe96a405b> | 2010-03-15 21:59:38 +0000 |
| commit | afff7cb11eeb9f13fbd4ffbb5ead869c8a4a50ca (patch) | |
| tree | dd4468843ea4851d1d087c85913d340cadc4fa91 | |
| parent | 12c52459a7a52fdec3c142e49d9dc632581981af (diff) | |
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: http://svn.digium.com/svn/asterisk/branches/1.6.0@252624 f38db490-d61c-443f-a65b-d21fe96a405b
| -rw-r--r-- | apps/app_meetme.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/apps/app_meetme.c b/apps/app_meetme.c index 8bc2f542d..f2c2aff86 100644 --- a/apps/app_meetme.c +++ b/apps/app_meetme.c @@ -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; } |