From 21f76d85f3ac5cbf17077dd21b2bab45be227aee Mon Sep 17 00:00:00 2001 From: russell Date: Wed, 11 Jul 2007 22:57:07 +0000 Subject: Merged revisions 74766 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.2 ........ r74766 | russell | 2007-07-11 17:53:26 -0500 (Wed, 11 Jul 2007) | 5 lines The function make_trunk() can fail and return -1 instead of a valid new call number. Fix the uses of this function to handle this instead of treating it as the new call number. This would cause a deadlock and memory corruption. (possible cause of issue #9614 and others, patch by me) ........ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.4@74767 f38db490-d61c-443f-a65b-d21fe96a405b --- channels/chan_iax2.c | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) (limited to 'channels') diff --git a/channels/chan_iax2.c b/channels/chan_iax2.c index 148351d04..08b64d5d2 100644 --- a/channels/chan_iax2.c +++ b/channels/chan_iax2.c @@ -6969,7 +6969,9 @@ retryowner: check_provisioning(&sin, fd, ies.serviceident, ies.provver); /* If we're in trunk mode, do it now, and update the trunk number in our frame before continuing */ if (ast_test_flag(iaxs[fr->callno], IAX_TRUNK)) { - fr->callno = make_trunk(fr->callno, 1); + int new_callno; + if ((new_callno = make_trunk(fr->callno, 1)) != -1) + fr->callno = new_callno; } /* For security, always ack immediately */ if (delayreject) @@ -8229,8 +8231,11 @@ static struct ast_channel *iax2_request(const char *type, int format, void *data /* If this is a trunk, update it now */ ast_copy_flags(iaxs[callno], &cai, IAX_TRUNK | IAX_SENDANI | IAX_NOTRANSFER | IAX_TRANSFERMEDIA | IAX_USEJITTERBUF | IAX_FORCEJITTERBUF); - if (ast_test_flag(&cai, IAX_TRUNK)) - callno = make_trunk(callno, 1); + if (ast_test_flag(&cai, IAX_TRUNK)) { + int new_callno; + if ((new_callno = make_trunk(callno, 1)) != -1) + callno = new_callno; + } iaxs[callno]->maxtime = cai.maxtime; if (cai.found) ast_string_field_set(iaxs[callno], host, pds.peer); -- cgit v1.2.3