[asterisk-commits] oej: branch 1.8 r336378 - in /branches/1.8: Makefile channels/chan_sip.c

[SVN commits to the Asterisk project]

Author: oej
Date: Mon Sep 19 04:40:44 2011
New Revision: 336378

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=336378
Log:
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!

Modified:
    branches/1.8/Makefile
    branches/1.8/channels/chan_sip.c

Modified: branches/1.8/Makefile
URL: http://svnview.digium.com/svn/asterisk/branches/1.8/Makefile?view=diff&rev=336378&r1=336377&r2=336378
==============================================================================
--- branches/1.8/Makefile (original)
+++ branches/1.8/Makefile Mon Sep 19 04:40:44 2011
@@ -278,7 +278,7 @@
 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

Modified: branches/1.8/channels/chan_sip.c
URL: http://svnview.digium.com/svn/asterisk/branches/1.8/channels/chan_sip.c?view=diff&rev=336378&r1=336377&r2=336378
==============================================================================
--- branches/1.8/channels/chan_sip.c (original)
+++ branches/1.8/channels/chan_sip.c Mon Sep 19 04:40:44 2011
@@ -25030,6 +25030,7 @@
 			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 */