[Asterisk-cvs] asterisk manager.c,1.74.2.3,1.74.2.4

russell russell
Mon Aug 8 14:54:41 CDT 2005


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

Modified Files:
      Tag: v1-0
	manager.c 
Log Message:
Fix poll error condition causing memory corruption (bug #4915)


Index: manager.c
===================================================================
RCS file: /usr/cvsroot/asterisk/manager.c,v
retrieving revision 1.74.2.3
retrieving revision 1.74.2.4
diff -u -d -r1.74.2.3 -r1.74.2.4
--- manager.c	15 Apr 2005 07:15:39 -0000	1.74.2.3
+++ manager.c	8 Aug 2005 18:58:19 -0000	1.74.2.4
@@ -1216,6 +1216,7 @@
 	res = poll(fds, 1, -1);
 	if (res < 0) {
 		ast_log(LOG_WARNING, "Select returned error: %s\n", strerror(errno));
+ 		return -1;
 	} else if (res > 0) {
 		ast_mutex_lock(&s->lock);
 		res = read(s->fd, s->inbuf + s->inlen, sizeof(s->inbuf) - 1 - s->inlen);




More information about the svn-commits mailing list