diff options
| author | tilghman <tilghman@f38db490-d61c-443f-a65b-d21fe96a405b> | 2008-11-12 19:29:12 +0000 |
|---|---|---|
| committer | tilghman <tilghman@f38db490-d61c-443f-a65b-d21fe96a405b> | 2008-11-12 19:29:12 +0000 |
| commit | 9e3bae38eda7c46a3fb298942772c728069e59ac (patch) | |
| tree | ef05fe473e0fc56385a53b8c680a0e39648584e6 /apps | |
| parent | 5858a44c1eeb037480fa3842208253a79d357dd4 (diff) | |
Merged revisions 156295 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk
................
r156295 | tilghman | 2008-11-12 13:28:22 -0600 (Wed, 12 Nov 2008) | 13 lines
Merged revisions 156294 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r156294 | tilghman | 2008-11-12 13:26:45 -0600 (Wed, 12 Nov 2008) | 6 lines
If the SLA thread is not started, then reload causes a memory leak.
(closes issue #13889)
Reported by: eliel
Patches:
app_meetme.c.patch uploaded by eliel (license 64)
........
................
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.1@156296 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'apps')
| -rw-r--r-- | apps/app_meetme.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/apps/app_meetme.c b/apps/app_meetme.c index e24b6045b..bdfb801c4 100644 --- a/apps/app_meetme.c +++ b/apps/app_meetme.c @@ -1447,6 +1447,10 @@ static void sla_queue_event_full(enum sla_event_type type, { struct sla_event *event; + if (sla.thread == AST_PTHREADT_NULL) { + return; + } + if (!(event = ast_calloc(1, sizeof(*event)))) return; |