[asterisk-commits] file: branch 1.6.0 r164352 - in /branches/1.6.0: ./ channels/chan_sip.c

[SVN commits to the Asterisk project]

Author: file
Date: Mon Dec 15 12:13:13 2008
New Revision: 164352

URL: http://svn.digium.com/view/asterisk?view=rev&rev=164352
Log:
Merged revisions 164351 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/trunk

................
  r164351 | file | 2008-12-15 14:12:24 -0400 (Mon, 15 Dec 2008) | 13 lines
  
  Merged revisions 164350 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.4
  
  ........
    r164350 | file | 2008-12-15 14:11:21 -0400 (Mon, 15 Dec 2008) | 6 lines
    
    Do not try to unlock a non-existant channel if the transfer fails.
    (closes issue #13800)
    Reported by: dwagner
    Patches:
          asterisk-1.4.22-chan-sip-nullp.patch uploaded by tweety (license 608)
  ........
................

Modified:
    branches/1.6.0/   (props changed)
    branches/1.6.0/channels/chan_sip.c

Propchange: branches/1.6.0/
------------------------------------------------------------------------------
Binary property 'trunk-merged' - no diff available.

Modified: branches/1.6.0/channels/chan_sip.c
URL: http://svn.digium.com/view/asterisk/branches/1.6.0/channels/chan_sip.c?view=diff&rev=164352&r1=164351&r2=164352
==============================================================================
--- branches/1.6.0/channels/chan_sip.c (original)
+++ branches/1.6.0/channels/chan_sip.c Mon Dec 15 12:13:13 2008
@@ -16894,7 +16894,9 @@
 			sip_pvt_unlock(p);
 			if (p->refer->refer_call) {
 				sip_pvt_unlock(p->refer->refer_call);
-				ast_channel_unlock(p->refer->refer_call->owner);
+				if (p->refer->refer_call->owner) {
+					ast_channel_unlock(p->refer->refer_call->owner);
+				}
 			}
 			p->invitestate = INV_COMPLETED;
 			return -1;