Merged revisions 230039 via svnmerge from

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

................
  r230039 | file | 2009-11-13 13:44:53 -0600 (Fri, 13 Nov 2009) | 16 lines

  Merged revisions 230038 via svnmerge from
  https://origsvn.digium.com/svn/asterisk/branches/1.4

  ........
    r230038 | file | 2009-11-13 13:44:07 -0600 (Fri, 13 Nov 2009) | 9 lines

    Fix a crash caused by two threads thinking they should both free the
    chan_local private structure when only one should.

    (closes issue #15314)
    Reported by: sroberts
    Patches:
          Issue15314_Move_Nulling_owner.patch uploaded by davidw (license 780)
    Tested by: davidw, lottc
  ........
................

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

diff --git a/channels/chan_local.c b/channels/chan_local.c
index b47b9a84a54e6892513165c6cacec74441a339c3..724c721f8f01ce66c59cda9c3e276e05d9de3693 100644 (file)
--- a/channels/chan_local.c
+++ b/channels/chan_local.c
@@ -610,11 +610,11 @@ static int local_hangup(struct ast_channel *ast)
                ast_clear_flag(p, LOCAL_LAUNCHED_PBX);
                ast_module_user_remove(p->u_chan);
        } else {
-               p->owner = NULL;
                ast_module_user_remove(p->u_owner);
                while (p->chan && ast_channel_trylock(p->chan)) {
                        DEADLOCK_AVOIDANCE(&p->lock);
                }
+               p->owner = NULL;
                if (p->chan) {
                        ast_queue_hangup(p->chan);
                        ast_channel_unlock(p->chan);