From: Matthew Nicholson <mnicholson@digium.com>
Date: Wed, 11 Aug 2010 17:27:59 +0000 (+0000)
Subject: Avoid a deadlock in add_header_max_forwards().
X-Git-Tag: 1.8.0-beta4~50
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=ea920c7cd3744714ef63d59fe76cefb3d1ca5bba;p=thirdparty%2Fasterisk.git

Avoid a deadlock in add_header_max_forwards().

Related to r276951


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

diff --git a/channels/chan_sip.c b/channels/chan_sip.c
index d6e4ccc1d8..3463843f3f 100644
--- a/channels/chan_sip.c
+++ b/channels/chan_sip.c
@@ -9035,8 +9035,16 @@ static int add_header_max_forwards(struct sip_pvt *dialog, struct sip_request *r
 	char clen[10];
 	const char *max = NULL;
 
+	/* deadlock avoidance */
+	while (dialog->owner && ast_channel_trylock(dialog->owner)) {
+		sip_pvt_unlock(dialog);
+		usleep(1);
+		sip_pvt_lock(dialog);
+	}
+
 	if (dialog->owner) {
  		max = pbx_builtin_getvar_helper(dialog->owner, "SIP_MAX_FORWARDS");
+		ast_channel_unlock(dialog->owner);
 	}
 
 	/* The channel variable overrides the peer/channel value */