diff options
| author | bweschke <bweschke@f38db490-d61c-443f-a65b-d21fe96a405b> | 2006-03-23 20:48:08 +0000 |
|---|---|---|
| committer | bweschke <bweschke@f38db490-d61c-443f-a65b-d21fe96a405b> | 2006-03-23 20:48:08 +0000 |
| commit | fecbdf1afa298506c305c8d97b54037162e52498 (patch) | |
| tree | a0a4d1d31ce338cab1545caabe3dea24c9bea027 /apps/app_meetme.c | |
| parent | 9402c54f97a3243e14735ac5596439eca9724302 (diff) | |
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: http://svn.digium.com/svn/asterisk/trunk@14470 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'apps/app_meetme.c')
| -rw-r--r-- | apps/app_meetme.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/apps/app_meetme.c b/apps/app_meetme.c index aeb537c4f..200144fdf 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; } } |