diff options
| author | Russell Bryant <russell@russellbryant.com> | 2007-06-13 16:29:45 +0000 |
|---|---|---|
| committer | Russell Bryant <russell@russellbryant.com> | 2007-06-13 16:29:45 +0000 |
| commit | 65880d7680f5f5a3e362be5e53d558cbf2125dfc (patch) | |
| tree | c410c2bd3e9147ef2bfbc58f21476be628d5340d | |
| parent | f379df97737c61fd224697f8cb891fe97802e3b9 (diff) | |
Merged revisions 69069 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r69069 | russell | 2007-06-13 11:29:12 -0500 (Wed, 13 Jun 2007) | 3 lines
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/trunk@69070 65c4cc65-6c06-0410-ace0-fbb531ad65f3
| -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 88e1f5495..a814c5f04 100644 --- a/channels/chan_iax2.c +++ b/channels/chan_iax2.c @@ -7203,11 +7203,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; |