[asterisk-commits] seanbright: branch group/1.6.1-maintenance r264333 - in /team/group/1.6.1-mai...

[SVN commits to the Asterisk project]

Author: seanbright
Date: Wed May 19 14:32:19 2010
New Revision: 264333

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

........
  r264331 | dvossel | 2010-05-19 15:21:04 -0400 (Wed, 19 May 2010) | 13 lines
  
  fixes crash in check_rtp_timeout
  
  During deadlock avoidance the sip dialog pvt is locked and
  unlocked.  When this occurs we have no guarantee the pvt's owner
  is still valid.  We were trying to access the pvt's owner after
  this without checking to see if it still existed first. 
  
  (closes issue #17271)
  Reported by: under
  Patches:
        check_rtp_timeout.diff uploaded by under (license 914)
  Tested by: dvossel
........

Modified:
    team/group/1.6.1-maintenance/   (props changed)
    team/group/1.6.1-maintenance/channels/chan_sip.c

Propchange: team/group/1.6.1-maintenance/
------------------------------------------------------------------------------
Binary property 'trunk-merged' - no diff available.

Modified: team/group/1.6.1-maintenance/channels/chan_sip.c
URL: http://svnview.digium.com/svn/asterisk/team/group/1.6.1-maintenance/channels/chan_sip.c?view=diff&rev=264333&r1=264332&r2=264333
==============================================================================
--- team/group/1.6.1-maintenance/channels/chan_sip.c (original)
+++ team/group/1.6.1-maintenance/channels/chan_sip.c Wed May 19 14:32:19 2010
@@ -21471,6 +21471,9 @@
 					sip_pvt_unlock(dialog);
 					usleep(1);
 					sip_pvt_lock(dialog);
+				}
+				if (!dialog->owner) {
+					return; /* channel hangup can occur during deadlock avoidance. */
 				}
 				ast_log(LOG_NOTICE, "Disconnecting call '%s' for lack of RTP activity in %ld seconds\n",
 					dialog->owner->name, (long) (t - dialog->lastrtprx));