Merged revisions 188937 via svnmerge from
authorJoshua Colp <jcolp@digium.com>
Fri, 17 Apr 2009 14:26:53 +0000 (14:26 +0000)
committerJoshua Colp <jcolp@digium.com>
Fri, 17 Apr 2009 14:26:53 +0000 (14:26 +0000)
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
  r188937 | file | 2009-04-17 11:25:57 -0300 (Fri, 17 Apr 2009) | 4 lines

  Fix a situation where the DAHDI channel private structure lock was not unlocked when it should have been.

  (issue AST-210)
........

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@188938 65c4cc65-6c06-0410-ace0-fbb531ad65f3

channels/chan_dahdi.c

index 1bcd667..d2f7f72 100644 (file)
@@ -12858,6 +12858,7 @@ static void *pri_dchannel(void *vpri)
                                                if (pri->pvts[chanpos]->call == e->ring.call) {
                                                        ast_log(LOG_WARNING, "Duplicate setup requested on channel %d/%d already in use on span %d\n",
                                                                PRI_SPAN(e->ring.channel), PRI_CHANNEL(e->ring.channel), pri->span);
+                                                       ast_mutex_unlock(&pri->pvts[chanpos]->lock);
                                                        break;
                                                } else {
                                                        /* This is where we handle initial glare */