aboutsummaryrefslogtreecommitdiffstats
path: root/manager.c
diff options
context:
space:
mode:
authormarkster <markster@f38db490-d61c-443f-a65b-d21fe96a405b>2005-08-07 22:59:04 +0000
committermarkster <markster@f38db490-d61c-443f-a65b-d21fe96a405b>2005-08-07 22:59:04 +0000
commit8f4d353391c36eb2d08efe564041f73744e8405c (patch)
tree135e33605ad1420dd7a0b96657c46edda93612d5 /manager.c
parent0b6d4b88ef378c2bd0051b838f53fea9920850c3 (diff)
Fix poll error condition causing memory corruption (bug #4915)
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@6303 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'manager.c')
-rwxr-xr-xmanager.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/manager.c b/manager.c
index d0c3eef2b..f868b9560 100755
--- a/manager.c
+++ b/manager.c
@@ -1301,6 +1301,7 @@ static int get_input(struct mansession *s, char *output)
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);