From: BJ Weschke <bweschke@btwtech.com>
Date: Thu, 23 Mar 2006 20:48:08 +0000 (+0000)
Subject: Merged revisions 14467 via svnmerge from
X-Git-Tag: 1.4.0-beta1~2350
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=fb8ff8ed574cee90304e7ea8a2943b74811760ce;p=thirdparty%2Fasterisk.git

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)


........


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@14470 65c4cc65-6c06-0410-ace0-fbb531ad65f3
---

diff --git a/apps/app_meetme.c b/apps/app_meetme.c
index aeb537c4f9..200144fdfe 100644
--- a/apps/app_meetme.c
+++ b/apps/app_meetme.c
@@ -779,6 +779,8 @@ static void conf_flush(int fd, struct ast_channel *chan)
 			f = ast_read(chan);
 			if (f)
 				ast_frfree(f);
+			else /* channel was hung up or something else happened */
+				break;
 		}
 	}