kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-09-29 18:19:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix potential segfault (bug #3479)

Browse Source 
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@4942 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Mark Spencer
2005-02-01 06:48:50 +00:00
parent a6c065816a
commit 4d92934e6e
1 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
apps/app_meetme.c
View File

@@ -755,7 +755,7 @@ zapretry:
ztc.confno = conf->zapconf; ztc.confno = conf->zapconf;
ast_mutex_lock(&conflock); ast_mutex_lock(&conflock);
if (!(confflags & CONFFLAG_QUIET) && (confflags & CONFFLAG_INTROUSER) && conf->users > 1) { if (!(confflags & CONFFLAG_QUIET) && (confflags & CONFFLAG_INTROUSER) && conf->users > 1) {
if (ast_fileexists(user->namerecloc, NULL, NULL)) { if (conf->chan && ast_fileexists(user->namerecloc, NULL, NULL)) {
if (!ast_streamfile(conf->chan, user->namerecloc, chan->language)) if (!ast_streamfile(conf->chan, user->namerecloc, chan->language))
ast_waitstream(conf->chan, ""); ast_waitstream(conf->chan, "");
if (!ast_streamfile(conf->chan, "conf-hasjoin", chan->language)) if (!ast_streamfile(conf->chan, "conf-hasjoin", chan->language))
@@ -1109,7 +1109,7 @@ zapretry:
conf_play(conf, LEAVE); conf_play(conf, LEAVE);
if (!(confflags & CONFFLAG_QUIET) && (confflags & CONFFLAG_INTROUSER) && conf->users > 1) { if (!(confflags & CONFFLAG_QUIET) && (confflags & CONFFLAG_INTROUSER) && conf->users > 1) {
if (ast_fileexists(user->namerecloc, NULL, NULL)) { if (conf->chan && ast_fileexists(user->namerecloc, NULL, NULL)) {
if (!ast_streamfile(conf->chan, user->namerecloc, chan->language)) if (!ast_streamfile(conf->chan, user->namerecloc, chan->language))
ast_waitstream(conf->chan, ""); ast_waitstream(conf->chan, "");
if (!ast_streamfile(conf->chan, "conf-hasleft", chan->language)) if (!ast_streamfile(conf->chan, "conf-hasleft", chan->language))
@@ -1719,6 +1719,9 @@ static void *recordthread(void *args)
int res=0; int res=0;
cnf = (struct ast_conference *)args; cnf = (struct ast_conference *)args;
if( !cnf || !cnf->chan ) {
pthread_exit(0);
}
ast_stopstream(cnf->chan); ast_stopstream(cnf->chan);
flags = O_CREAT|O_TRUNC|O_WRONLY; flags = O_CREAT|O_TRUNC|O_WRONLY;
s = ast_writefile(cnf->recordingfilename, cnf->recordingformat, NULL, flags, 0, 0644); s = ast_writefile(cnf->recordingfilename, cnf->recordingformat, NULL, flags, 0, 0644);