From: Olle Johansson <oej@edvina.net>
Date: Mon, 19 Sep 2011 10:05:00 +0000 (+0000)
Subject: Merged revisions 336378 via svnmerge from
X-Git-Tag: 10.0.0-beta2~42
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0cfc3c6e9e5f79c55cdefd999ae3ed8087347e10;p=thirdparty%2Fasterisk.git

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/branches/10@336381 65c4cc65-6c06-0410-ace0-fbb531ad65f3
---

diff --git a/channels/chan_sip.c b/channels/chan_sip.c
index 5a5dcd0005..6474d2dceb 100644
--- a/channels/chan_sip.c
+++ b/channels/chan_sip.c
@@ -25668,6 +25668,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 */