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: https://origsvn.digium.com/svn/asterisk/trunk@156295 65c4cc65-6c06-0410-ace0-fbb531ad65f3

diff --git a/apps/app_meetme.c b/apps/app_meetme.c
index 9f66162e7bb093946cf5c16f063ddc7d9d1cd7f0..b7c4cc6f2976c879d4dbc3e931c681244087f9b5 100644 (file)
--- 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;