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

[asterisk-commits at lists.digium.com]

Author: bweschke
Date: Thu Mar 23 14:48:08 2006
New Revision: 14470

URL: http://svn.digium.com/view/asterisk?rev=14470&view=rev
Log:
Merged revisions 14467 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.2

........
r14467 | bweschke | 2006-03-23 14:43:05 -0600 (Thu, 23 Mar 2006) | 3 lines

 Bug #5884 - fix a possible race state in app_meetme when a channel has gone away and we are reading continuously for more frames. (mneuhauser)


........

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

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

Modified: trunk/apps/app_meetme.c
URL: http://svn.digium.com/view/asterisk/trunk/apps/app_meetme.c?rev=14470&r1=14469&r2=14470&view=diff
==============================================================================
--- trunk/apps/app_meetme.c (original)
+++ trunk/apps/app_meetme.c Thu Mar 23 14:48:08 2006
@@ -779,6 +779,8 @@
 			f = ast_read(chan);
 			if (f)
 				ast_frfree(f);
+			else /* channel was hung up or something else happened */
+				break;
 		}
 	}