Merged revisions 77780 via svnmerge from
authorRussell Bryant <russell@russellbryant.com>
Mon, 30 Jul 2007 17:31:29 +0000 (17:31 +0000)
committerRussell Bryant <russell@russellbryant.com>
Mon, 30 Jul 2007 17:31:29 +0000 (17:31 +0000)
commita2fc80d4a685f92fd1c85fbd7313975b50c4110a
tree5061a58c4a8a9d877d19092594eeb514cf32b1e5
parent9d2d0e3896823a16a68844d06fda0f76fce94c2a
Merged revisions 77780 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r77780 | russell | 2007-07-30 12:29:43 -0500 (Mon, 30 Jul 2007) | 16 lines

(closes issue #10301)
Reported by: fnordian
Patches:
      asterisk-1.4.9-channel.c.patch uploaded by fnordian (license 110)
      Additional changes by me

Fix some problems in channel_find_locked() which can cause an infinite loop.
The reference to the previous channel is set to NULL in some cases.  These changes
ensure that the reference to the previous channel gets restored before needing
it again.

I'm not convinced that the code that is setting it to NULL is really the right
thing to do.  However, I am making these changes to fix the obvious problem
and just leaving an XXX comment that it needs a better explanation that what
is there now.

........

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@77781 65c4cc65-6c06-0410-ace0-fbb531ad65f3
main/channel.c