Merged revisions 330586 via svnmerge from
authorDavid Vossel <dvossel@digium.com>
Tue, 2 Aug 2011 16:19:32 +0000 (16:19 +0000)
committerDavid Vossel <dvossel@digium.com>
Tue, 2 Aug 2011 16:19:32 +0000 (16:19 +0000)
commite128ee256726e002307cf24b37aae40e29a6c9e6
tree8d4aad6cf065150d6e8b15778b9965de2dfb101d
parent6f112cce0d5a3f50ed20f8d98550c5810db62746
Merged revisions 330586 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/10

................
  r330586 | dvossel | 2011-08-02 11:17:59 -0500 (Tue, 02 Aug 2011) | 15 lines

  Merged revisions 330581 via svnmerge from
  https://origsvn.digium.com/svn/asterisk/branches/1.8

  ........
    r330581 | dvossel | 2011-08-02 11:15:08 -0500 (Tue, 02 Aug 2011) | 8 lines

    Fixes crash in chan_iax2.

    Fixes crash in chan_iax2 resulting from an edge case in the
    way control frames are queued during calltoken negotiation is complete.

    (closes issue ASTERISK-17610)
    Reported by: mgrobecker
  ........
................

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@330593 65c4cc65-6c06-0410-ace0-fbb531ad65f3
channels/chan_iax2.c