From: David Vossel <dvossel@digium.com>
Date: Wed, 19 May 2010 19:21:04 +0000 (+0000)
Subject: fixes crash in check_rtp_timeout
X-Git-Tag: 11.0.0-beta1~3003
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0407208b6d6ab14a14e253ec8dc062e493bdb331;p=thirdparty%2Fasterisk.git

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


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@264331 65c4cc65-6c06-0410-ace0-fbb531ad65f3
---

diff --git a/channels/chan_sip.c b/channels/chan_sip.c
index 9bb79167ad..689ed477b7 100644
--- a/channels/chan_sip.c
+++ b/channels/chan_sip.c
@@ -23461,6 +23461,9 @@ static void check_rtp_timeout(struct sip_pvt *dialog, time_t t)
 					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));
 				/* Issue a softhangup */