diff options
| author | russell <russell@f38db490-d61c-443f-a65b-d21fe96a405b> | 2007-06-13 16:29:12 +0000 |
|---|---|---|
| committer | russell <russell@f38db490-d61c-443f-a65b-d21fe96a405b> | 2007-06-13 16:29:12 +0000 |
| commit | 926bdee7e1cb3d2518deac4d9d52f81894891176 (patch) | |
| tree | 1c21b36d05fed99903ceed720da353cee900d39e | |
| parent | 639789106ea1f21f4a15aa3ec0979f7befe18ca2 (diff) | |
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: http://svn.digium.com/svn/asterisk/branches/1.4@69069 f38db490-d61c-443f-a65b-d21fe96a405b
| -rw-r--r-- | channels/chan_iax2.c | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/channels/chan_iax2.c b/channels/chan_iax2.c index c94a6dac6..527b48977 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; |