Merged revisions 14467 via svnmerge from
authorBJ Weschke <bweschke@btwtech.com>
Thu, 23 Mar 2006 20:48:08 +0000 (20:48 +0000)
committerBJ Weschke <bweschke@btwtech.com>
Thu, 23 Mar 2006 20:48:08 +0000 (20:48 +0000)
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

apps/app_meetme.c

index aeb537c..200144f 100644 (file)
@@ -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;
                }
        }