Merged revisions 90696 via svnmerge from

https://origsvn.digium.com/svn/asterisk/branches/1.4

(Closes issue #11383)
........
r90696 | qwell | 2007-12-03 16:06:36 -0600 (Mon, 03 Dec 2007) | 4 lines

Make sure we always close the conference fd if we have an open one.

Issue 11383, reported by markmhy, patch by eliel.

........

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

diff --git a/apps/app_meetme.c b/apps/app_meetme.c
index f39a48155d3ab1313f4b138e19ea1333b94b3e45..6341c4165f875beccf3e25f882ed3b36006da71a 100644 (file)
--- a/apps/app_meetme.c
+++ b/apps/app_meetme.c
@@ -1349,7 +1349,7 @@ static int conf_free(struct ast_conference *conf)
                ast_hangup(conf->lchan);
        if (conf->chan)
                ast_hangup(conf->chan);
-       else
+       if (conf->fd >= 0)
                close(conf->fd);
 
        ast_mutex_destroy(&conf->playlock);