diff options
| author | jpeeler <jpeeler@f38db490-d61c-443f-a65b-d21fe96a405b> | 2009-10-06 23:58:30 +0000 |
|---|---|---|
| committer | jpeeler <jpeeler@f38db490-d61c-443f-a65b-d21fe96a405b> | 2009-10-06 23:58:30 +0000 |
| commit | a5c7f216deb96527e4387e78c54bc7a611baf6a9 (patch) | |
| tree | 370565c8eb118616dca2adb347baa038aca3f842 /channels | |
| parent | 90b985bc30422eeb4f73169beaaa65da0ef61849 (diff) | |
Merged revisions 222463 via svnmerge from
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: http://svn.digium.com/svn/asterisk/branches/1.6.1@222465 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'channels')
| -rw-r--r-- | channels/chan_dahdi.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/channels/chan_dahdi.c b/channels/chan_dahdi.c index d68876a7f..cdfb867b3 100644 --- a/channels/chan_dahdi.c +++ b/channels/chan_dahdi.c @@ -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; |