aboutsummaryrefslogtreecommitdiffstats
path: root/main/manager.c
diff options
context:
space:
mode:
Diffstat (limited to 'main/manager.c')
-rw-r--r--main/manager.c8
1 files changed, 6 insertions, 2 deletions
diff --git a/main/manager.c b/main/manager.c
index c0245ad2a..7f436ad94 100644
--- a/main/manager.c
+++ b/main/manager.c
@@ -2142,11 +2142,15 @@ static int action_userevent(struct mansession *s, const struct message *m)
{
const char *event = astman_get_header(m, "UserEvent");
char body[2048] = "";
- int x, bodylen = 0;
+ int x, bodylen = 0, xlen;
for (x = 0; x < m->hdrcount; x++) {
if (strncasecmp("UserEvent:", m->headers[x], strlen("UserEvent:"))) {
+ if (sizeof(body) < bodylen + (xlen = strlen(m->headers[x])) + 3) {
+ ast_log(LOG_WARNING, "UserEvent exceeds our buffer length. Truncating.\n");
+ break;
+ }
ast_copy_string(body + bodylen, m->headers[x], sizeof(body) - bodylen - 3);
- bodylen += strlen(m->headers[x]);
+ bodylen += xlen;
ast_copy_string(body + bodylen, "\r\n", 3);
bodylen += 2;
}