diff options
| author | seanbright <seanbright@f38db490-d61c-443f-a65b-d21fe96a405b> | 2010-03-15 21:59:43 +0000 |
|---|---|---|
| committer | seanbright <seanbright@f38db490-d61c-443f-a65b-d21fe96a405b> | 2010-03-15 21:59:43 +0000 |
| commit | 54f3c5532fd87173f3c5f8e9a3081ea5ed08c1e6 (patch) | |
| tree | 6d3b6a86443790db1db7b3cc374c61b5f5738bd5 /apps | |
| parent | 20e481d5b16b4a4ef06003f575172986d4fcf063 (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.2@252626 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'apps')
| -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 40f1fcd04..26ee0dd69 100644 --- a/apps/app_meetme.c +++ b/apps/app_meetme.c @@ -5844,7 +5844,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; } |