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/1.8@336378 65c4cc65-6c06-0410-ace0-fbb531ad65f3

diff --git a/Makefile b/Makefile
index 228d6027bcea4e4ac3a5c3866b5033be1272a8bf..48131a1efff0c4a4c6d7f04c8dc565e990070116 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -278,7 +278,7 @@ MOD_SUBDIRS_MENUSELECT_TREE:=$(MOD_SUBDIRS:%=%-menuselect-tree)
 ifneq ($(findstring darwin,$(OSARCH)),)
   _ASTCFLAGS+=-D__Darwin__
   SOLINK=-bundle -Xlinker -macosx_version_min -Xlinker 10.4 -Xlinker -undefined -Xlinker dynamic_lookup -force_flat_namespace
-  ifeq ($(shell /usr/bin/sw_vers -productVersion | cut -c1-4),10.6)
+  ifeq ($(shell /usr/bin/sw_vers -productVersion | cut -c1-4),10.7)
     SOLINK+=/usr/lib/bundle1.o
   endif
   _ASTLDFLAGS+=-L/usr/local/lib

diff --git a/channels/chan_sip.c b/channels/chan_sip.c
index 676c12494c0d762328e6d83f7e1aa753df305247..0c110fbbf07f469452e2731c186caf8146c61bd3 100644 (file)
--- a/channels/chan_sip.c
+++ b/channels/chan_sip.c
@@ -25030,6 +25030,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 0;
                }
                /* Recalculate our side, and recalculate Call ID */