]> git.ipfire.org Git - thirdparty/asterisk.git/commitdiff
Merged revisions 315051 via svnmerge from
authorAlec L Davis <sivad.a@paradise.net.nz>
Mon, 25 Apr 2011 07:11:12 +0000 (07:11 +0000)
committerAlec L Davis <sivad.a@paradise.net.nz>
Mon, 25 Apr 2011 07:11:12 +0000 (07:11 +0000)
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
  r315051 | alecdavis | 2011-04-25 19:06:29 +1200 (Mon, 25 Apr 2011) | 11 lines

  chan_local:check_bridge() misplaced misplaced ast_mutex_unlock

  if !p->chan->_bridge->_softhangup path isn't followed, brigde remains locked.

  (closes issue #19176)
  Reported by: alecdavis
  Patches:
        bug19176.diff.txt uploaded by alecdavis (license 585)
........

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

channels/chan_local.c

index 6f7d232750fbc765e8d3c44155b6099f3bc30e79..8d13f28a741ebe028ce8ab489efc9217edea5135 100644 (file)
@@ -468,8 +468,8 @@ static void check_bridge(struct local_pvt *p)
                                        }
                                        ast_channel_unlock(p->owner);
                                }
-                               ast_channel_unlock(p->chan->_bridge);
                        }
+                       ast_channel_unlock(p->chan->_bridge);
                }
        }
 }