Merged revisions 90696 via svnmerge from
authorJason Parker <jparker@digium.com>
Mon, 3 Dec 2007 22:07:57 +0000 (22:07 +0000)
committerJason Parker <jparker@digium.com>
Mon, 3 Dec 2007 22:07:57 +0000 (22:07 +0000)
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

apps/app_meetme.c

index f39a481..6341c41 100644 (file)
@@ -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);