diff options
| author | Terry Wilson <twilson@digium.com> | 2011-03-16 19:51:04 +0000 |
|---|---|---|
| committer | Terry Wilson <twilson@digium.com> | 2011-03-16 19:51:04 +0000 |
| commit | d0846ea207235d98eda7bbe3be3e9d16dd36614f (patch) | |
| tree | 9632700d267b13422d866f7f1ccec2654b7ffb0d /main/manager.c | |
| parent | d958ca69534785b07cce1d4352839b872db5e395 (diff) | |
Merged revisions 310993 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.8
................
r310993 | twilson | 2011-03-16 14:26:57 -0500 (Wed, 16 Mar 2011) | 11 lines
Merged revisions 310992 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.6.2
........
r310992 | twilson | 2011-03-16 14:23:03 -0500 (Wed, 16 Mar 2011) | 4 lines
Don't keep trying to write to a closed connection
See security advisory AST-2011-003.
........
................
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@311000 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'main/manager.c')
| -rw-r--r-- | main/manager.c | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/main/manager.c b/main/manager.c index f69f3fad8..36478edb7 100644 --- a/main/manager.c +++ b/main/manager.c @@ -962,6 +962,7 @@ struct mansession { struct ast_tcptls_session_instance *tcptls_session; FILE *f; int fd; + int write_error:1; struct manager_custom_hook *hook; ast_mutex_t lock; }; @@ -1835,6 +1836,7 @@ int ast_hook_send_action(struct manager_custom_hook *hook, const char *msg) */ static int send_string(struct mansession *s, char *string) { + int res; /* It's a result from one of the hook's action invocation */ if (s->hook) { /* @@ -1843,11 +1845,13 @@ static int send_string(struct mansession *s, char *string) */ s->hook->helper(EVENT_FLAG_HOOKRESPONSE, "HookResponse", string); return 0; - } else if (s->f) { - return ast_careful_fwrite(s->f, s->fd, string, strlen(string), s->session->writetimeout); - } else { - return ast_careful_fwrite(s->session->f, s->session->fd, string, strlen(string), s->session->writetimeout); + } else if (s->f && (res = ast_careful_fwrite(s->f, s->fd, string, strlen(string), s->session->writetimeout))) { + s->write_error = 1; + } else if ((res = ast_careful_fwrite(s->session->f, s->session->fd, string, strlen(string), s->session->writetimeout))) { + s->write_error = 1; } + + return res; } /*! @@ -4686,7 +4690,7 @@ static void *session_do(void *data) ao2_unlock(session); astman_append(&s, "Asterisk Call Manager/%s\r\n", AMI_VERSION); /* welcome prompt */ for (;;) { - if ((res = do_message(&s)) < 0) { + if ((res = do_message(&s)) < 0 || s.write_error) { break; } } |