kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-11-01 03:04:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

Make sure no path leaves channel lock locked

Browse Source 
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@2399 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Mark Spencer
2004-03-11 18:00:08 +00:00
parent 8812409528
commit f12928f700
1 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
channels/chan_zap.c
View File

@@ -3463,8 +3463,10 @@ struct ast_frame *zt_read(struct ast_channel *ast)
ZT_PARAMS ps;
ps.channo = p->channel;
if (ioctl(p->subs[SUB_REAL].zfd, ZT_GET_PARAMS, &ps) < 0)
if (ioctl(p->subs[SUB_REAL].zfd, ZT_GET_PARAMS, &ps) < 0) {
ast_mutex_unlock(&p->lock);
return NULL;
}
p->firstradio = 1;
p->subs[index].f.frametype = AST_FRAME_CONTROL;
if (ps.rxisoffhook)
@@ -3580,6 +3582,7 @@ struct ast_frame *zt_read(struct ast_channel *ast)
c = tdd_feed(p->tdd,readbuf,READ_SIZE);
if (c < 0) {
ast_log(LOG_DEBUG,"tdd_feed failed\n");
ast_mutex_unlock(&p->lock);
return NULL;
}
if (c) { /* if a char to return */