Merged revisions 336381 via svnmerge from
authorOlle Johansson <oej@edvina.net>
Mon, 19 Sep 2011 10:10:11 +0000 (10:10 +0000)
committerOlle Johansson <oej@edvina.net>
Mon, 19 Sep 2011 10:10:11 +0000 (10:10 +0000)
https://origsvn.digium.com/svn/asterisk/branches/10

................
  r336381 | oej | 2011-09-19 12:05:00 +0200 (Mån, 19 Sep 2011) | 16 lines

  Merged revisions 336378 via svnmerge from
  https://origsvn.digium.com/svn/asterisk/branches/1.8

  ........
    r336378 | oej | 2011-09-19 11:40:44 +0200 (Mån, 19 Sep 2011) | 9 lines

    Add missing unlock at MWI message sending time

    (closes issue ASTERISK-18573)

    Patches:
       sip_mwi_lock.patch (license #5041) by Gregory Hinton Nietsky

    Thanks to irrot for the reminder, to Gregory for the patch!
  ........
................

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

channels/chan_sip.c

index 9134f44..89e3e41 100644 (file)
@@ -25700,6 +25700,7 @@ static int sip_send_mwi_to_peer(struct sip_peer *peer, int cache_only)
                        dialog_unlink_all(p, TRUE, TRUE);
                        dialog_unref(p, "unref dialog p just created via sip_alloc");
                        /* sip_destroy(p); */
+                       ao2_unlock(peer);
                        return -1;
                }
                /* Recalculate our side, and recalculate Call ID */