[svn-commits] tilghman: trunk r156295 - in /trunk: ./ apps/app_meetme.c

[SVN commits to the Digium repositories]

Author: tilghman
Date: Wed Nov 12 13:28:22 2008
New Revision: 156295

URL: http://svn.digium.com/view/asterisk?view=rev&rev=156295
Log:
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)
........

Modified:
    trunk/   (props changed)
    trunk/apps/app_meetme.c

Propchange: trunk/
------------------------------------------------------------------------------
Binary property 'branch-1.4-merged' - no diff available.

Modified: trunk/apps/app_meetme.c
URL: http://svn.digium.com/view/asterisk/trunk/apps/app_meetme.c?view=diff&rev=156295&r1=156294&r2=156295
==============================================================================
--- trunk/apps/app_meetme.c (original)
+++ trunk/apps/app_meetme.c Wed Nov 12 13:28:22 2008
@@ -1499,6 +1499,10 @@
 	struct sla_trunk_ref *trunk_ref, struct sla_station *station, int lock)
 {
 	struct sla_event *event;
+
+	if (sla.thread == AST_PTHREADT_NULL) {
+		return;
+	}
 
 	if (!(event = ast_calloc(1, sizeof(*event))))
 		return;