mirror of
https://github.com/asterisk/asterisk.git
synced 2026-07-27 16:07:15 -07:00
Added deadlock protection to try_suggested_sip_codec in chan_sip.c.
Review: https://reviewboard.asterisk.org/r/287/ git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.2@202007 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
+14
-2
@@ -5823,8 +5823,20 @@ static void try_suggested_sip_codec(struct sip_pvt *p)
|
||||
int fmt;
|
||||
const char *codec;
|
||||
|
||||
codec = pbx_builtin_getvar_helper(p->owner, "SIP_CODEC");
|
||||
if (!codec)
|
||||
while (p->owner && ast_channel_trylock(p->owner)) {
|
||||
sip_pvt_unlock(p);
|
||||
sched_yield();
|
||||
sip_pvt_lock(p);
|
||||
}
|
||||
|
||||
if (!p->owner)
|
||||
return;
|
||||
|
||||
codec = ast_strdupa(S_OR(pbx_builtin_getvar_helper(p->owner, "SIP_CODEC"), ""));
|
||||
|
||||
ast_channel_unlock(p->owner);
|
||||
|
||||
if (ast_strlen_zero(codec))
|
||||
return;
|
||||
|
||||
fmt = ast_getformatbyname(codec);
|
||||
|
||||
Reference in New Issue
Block a user