[Asterisk-cvs] asterisk app.c,1.67,1.68 manager.c,1.100,1.101

[kpfleming at lists.digium.com]

Update of /usr/cvsroot/asterisk
In directory mongoose.digium.com:/tmp/cvs-serv31069

Modified Files:
	app.c manager.c 
Log Message:
fix channel walking problems from recent changes (bug #4494)


Index: app.c
===================================================================
RCS file: /usr/cvsroot/asterisk/app.c,v
retrieving revision 1.67
retrieving revision 1.68
diff -u -d -r1.67 -r1.68
--- app.c	6 Jun 2005 22:12:18 -0000	1.67
+++ app.c	9 Jun 2005 19:27:19 -0000	1.68
@@ -1059,7 +1059,6 @@
 		if (test && !regexec(&regexbuf, test, 0, NULL, 0))
 			count++;
 		ast_mutex_unlock(&chan->lock);
-		chan = ast_channel_walk_locked(chan);
 	}
 
 	regfree(&regexbuf);

Index: manager.c
===================================================================
RCS file: /usr/cvsroot/asterisk/manager.c,v
retrieving revision 1.100
retrieving revision 1.101
diff -u -d -r1.100 -r1.101
--- manager.c	6 Jun 2005 22:12:18 -0000	1.100
+++ manager.c	9 Jun 2005 19:27:19 -0000	1.101
@@ -753,6 +753,7 @@
 			ast_state2str(c->_state), bridge, c->uniqueid, idText);
 		}
 		ast_mutex_unlock(&s->lock);
+		ast_mutex_unlock(&c->lock);
 		if (!all)
 			break;
 		c = ast_channel_walk_locked(c);