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

Merged revisions 222463 via svnmerge from

Browse Source 
https://origsvn.digium.com/svn/asterisk/trunk

................
  r222463 | jpeeler | 2009-10-06 18:56:01 -0500 (Tue, 06 Oct 2009) | 14 lines
  
  Merged revisions 222462 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.4
  
  ........
    r222462 | jpeeler | 2009-10-06 18:51:19 -0500 (Tue, 06 Oct 2009) | 8 lines
    
    Add missing unlock(s) in dahdi_read
    
    (two cases in trunk)
    
    (closes issue #15683)
    Reported by: alecdavis
  ........
................


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@222465 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Jeff Peeler
2009-10-06 23:58:30 +00:00
parent 09051408df
commit 2371977ff9
1 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
channels/chan_dahdi.c
View File

@@ -5679,7 +5679,10 @@ static struct ast_frame *dahdi_read(struct ast_channel *ast)
return NULL;
}
if ((p->radio || (p->oprmode < 0)) && p->inalarm) return NULL;
if ((p->radio || (p->oprmode < 0)) && p->inalarm) {
ast_mutex_unlock(&p->lock);
return NULL;
}
p->subs[idx].f.frametype = AST_FRAME_NULL;
p->subs[idx].f.datalen = 0;