Merged revisions 68157 via svnmerge from
authorJoshua Colp <jcolp@digium.com>
Thu, 7 Jun 2007 18:41:17 +0000 (18:41 +0000)
committerJoshua Colp <jcolp@digium.com>
Thu, 7 Jun 2007 18:41:17 +0000 (18:41 +0000)
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)

........

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

main/channel.c

index 64ac4e5..4d329d4 100644 (file)
@@ -950,6 +950,11 @@ static struct ast_channel *channel_find_locked(const struct ast_channel *prev,
                                 * 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 */
                                if ((!namelen && strcasecmp(c->name, name)) ||