[asterisk-commits] oej: trunk r336382 - in /trunk: ./ channels/chan_sip.c

[SVN commits to the Asterisk project]

Author: oej
Date: Mon Sep 19 05:10:11 2011
New Revision: 336382

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=336382
Log:
Merged revisions 336381 via svnmerge from 
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!
  ........
................

Modified:
    trunk/   (props changed)
    trunk/channels/chan_sip.c

Propchange: trunk/
------------------------------------------------------------------------------
Binary property 'branch-10-merged' - no diff available.

Modified: trunk/channels/chan_sip.c
URL: http://svnview.digium.com/svn/asterisk/trunk/channels/chan_sip.c?view=diff&rev=336382&r1=336381&r2=336382
==============================================================================
--- trunk/channels/chan_sip.c (original)
+++ trunk/channels/chan_sip.c Mon Sep 19 05:10:11 2011
@@ -25700,6 +25700,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 -1;
 		}
 		/* Recalculate our side, and recalculate Call ID */