diff --git a/channels/chan_sip.c b/channels/chan_sip.c index d4e9f0af8e7595ca3bd31223f56a37b7d2beda8b..2a656bad8177f0c8ac320718ab69d53beb961128 100644 --- a/channels/chan_sip.c +++ b/channels/chan_sip.c @@ -9038,8 +9038,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 */