[asterisk-commits] file: trunk r68158 - in /trunk: ./ main/channel.c

[asterisk-commits at lists.digium.com]

Author: file
Date: Thu Jun  7 13:41:17 2007
New Revision: 68158

URL: http://svn.digium.com/view/asterisk?view=rev&rev=68158
Log:
Merged revisions 68157 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r68157 | file | 2007-06-07 14:39:52 -0400 (Thu, 07 Jun 2007) | 2 lines

Fix logic when doing a name based channel search for a structure when you want to start from a specific point in the channel list. (issue #9324 reported by slavon)

........

Modified:
    trunk/   (props changed)
    trunk/main/channel.c

Propchange: trunk/
------------------------------------------------------------------------------
Binary property 'branch-1.4-merged' - no diff available.

Modified: trunk/main/channel.c
URL: http://svn.digium.com/view/asterisk/trunk/main/channel.c?view=diff&rev=68158&r1=68157&r2=68158
==============================================================================
--- trunk/main/channel.c (original)
+++ trunk/main/channel.c Thu Jun  7 13:41:17 2007
@@ -949,6 +949,11 @@
 				/* If prev was the last item on the channel list, then we just
 				 * want to return NULL, instead of trying to deref NULL in the
 				 * next section.
+				 */
+				prev = NULL;
+				/* We want prev to be NULL in case we end up doing more searching through
+				 * the channel list to find the channel (ie: name searching). If we didn't
+				 * set this to NULL the logic would just blow up
 				 */
 			}
 			if (name) { /* want match by name */