From 0072ea99331eab89e20c9ac0c81ec8a9426ec592 Mon Sep 17 00:00:00 2001 From: Russell Bryant Date: Wed, 13 Jun 2007 16:29:12 +0000 Subject: [PATCH] Fix a place where a chan_iax2 pvt struct was accessed without the lock held. This issue was reported to me via email by Dmitry Mishchenko. Thanks! git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.4@69069 65c4cc65-6c06-0410-ace0-fbb531ad65f3 --- channels/chan_iax2.c | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/channels/chan_iax2.c b/channels/chan_iax2.c index c94a6dac67..527b489772 100644 --- a/channels/chan_iax2.c +++ b/channels/chan_iax2.c @@ -6904,11 +6904,18 @@ retryowner: ast_log(LOG_NOTICE, "Rejected connect attempt from %s, who was trying to reach '%s@%s'\n", ast_inet_ntoa(sin.sin_addr), iaxs[fr->callno]->exten, iaxs[fr->callno]->context); break; } - /* This might re-enter the IAX code and need the lock */ if (strcasecmp(iaxs[fr->callno]->exten, "TBD")) { + const char *context, *exten, *cid_num; + + context = ast_strdupa(iaxs[fr->callno]->context); + exten = ast_strdupa(iaxs[fr->callno]->exten); + cid_num = ast_strdupa(iaxs[fr->callno]->cid_num); + + /* This might re-enter the IAX code and need the lock */ ast_mutex_unlock(&iaxsl[fr->callno]); - exists = ast_exists_extension(NULL, iaxs[fr->callno]->context, iaxs[fr->callno]->exten, 1, iaxs[fr->callno]->cid_num); + exists = ast_exists_extension(NULL, context, exten, 1, cid_num); ast_mutex_lock(&iaxsl[fr->callno]); + if (!iaxs[fr->callno]) { ast_mutex_unlock(&iaxsl[fr->callno]); return 1;