Merged revisions 74767 via svnmerge from
authorRussell Bryant <russell@russellbryant.com>
Wed, 11 Jul 2007 23:05:34 +0000 (23:05 +0000)
committerRussell Bryant <russell@russellbryant.com>
Wed, 11 Jul 2007 23:05:34 +0000 (23:05 +0000)
https://origsvn.digium.com/svn/asterisk/branches/1.4

................
r74767 | russell | 2007-07-11 17:57:07 -0500 (Wed, 11 Jul 2007) | 13 lines

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: https://origsvn.digium.com/svn/asterisk/trunk@74769 65c4cc65-6c06-0410-ace0-fbb531ad65f3

channels/chan_iax2.c

index fdb0f6d..2e452c3 100644 (file)
@@ -7246,7 +7246,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)
@@ -8519,8 +8521,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);