[asterisk-commits] file: trunk r47749 - in /trunk: ./ apps/app_meetme.c

[asterisk-commits at lists.digium.com]

Author: file
Date: Thu Nov 16 11:53:58 2006
New Revision: 47749

URL: http://svn.digium.com/view/asterisk?view=rev&rev=47749
Log:
Merged revisions 47748 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r47748 | file | 2006-11-16 12:52:48 -0500 (Thu, 16 Nov 2006) | 2 lines

Don't unreference the SLA object if there is no SLA object in the devicestate callback. (issue #8354 reported by loloski)

........

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=47749&r1=47748&r2=47749
==============================================================================
--- trunk/apps/app_meetme.c (original)
+++ trunk/apps/app_meetme.c Thu Nov 16 11:53:58 2006
@@ -2953,6 +2953,10 @@
 
 	/* Find conference */
 	sla = sla2 = ASTOBJ_CONTAINER_FIND(&slas, data);
+
+	if (!sla2)
+		return AST_DEVICE_INVALID;
+
 	ASTOBJ_UNREF(sla2, sla_destroy);
 
 	if (option_debug)