kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-10-25 14:06:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

It is possible for framein to get called and no channel be available, so do a check before we increment the count.

Browse Source 
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@49716 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Joshua Colp
2007-01-05 23:51:43 +00:00
parent 21df48d4fa
commit 130eb5602f
1 changed files with 8 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
codecs/codec_zap.c
View File

@@ -142,10 +142,18 @@ static int zap_framein(struct ast_trans_pvt *pvt, struct ast_frame *f)
if(!ztp->inuse) { if(!ztp->inuse) {
ast_mutex_lock(&channelcount); ast_mutex_lock(&channelcount);
if(pvt->t->dstfmt == 8 || pvt->t->dstfmt == 0 ) { if(pvt->t->dstfmt == 8 || pvt->t->dstfmt == 0 ) {
if (complexinuse == totalchannels) {
ast_mutex_unlock(&channelcount);
return -1;
}
complexinuse++; complexinuse++;
if(complexinuse == totalchannels) if(complexinuse == totalchannels)
deactivate_translator(0); deactivate_translator(0);
} else { } else {
if (simpleinuse == totalchannels) {
ast_mutex_unlock(&channelcount);
return -1;
}
simpleinuse++; simpleinuse++;
if(simpleinuse == totalchannels) if(simpleinuse == totalchannels)
deactivate_translator(1); deactivate_translator(1);