From e7bb3059cae74227d9ca757eec0f92f391f0b2c4 Mon Sep 17 00:00:00 2001 From: tilghman Date: Wed, 12 Nov 2008 19:28:22 +0000 Subject: 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/trunk@156295 f38db490-d61c-443f-a65b-d21fe96a405b --- apps/app_meetme.c | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'apps/app_meetme.c') diff --git a/apps/app_meetme.c b/apps/app_meetme.c index 9f66162e7..b7c4cc6f2 100644 --- a/apps/app_meetme.c +++ b/apps/app_meetme.c @@ -1500,6 +1500,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; -- cgit v1.2.3