kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-09-05 12:16:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

Truncate userevents at the end of a line, when the command exceeds the buffer.

Browse Source 
(closes issue #14278)
 Reported by: fnordian


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.4@169364 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Tilghman Lesher
2009-01-19 19:49:25 +00:00
parent ece7a8f9e9
commit f311539733
2 changed files with 14 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
apps/app_userevent.c
View File

@@ -59,7 +59,7 @@ static int userevent_exec(struct ast_channel *chan, void *data)
{
struct ast_module_user *u;
char *parse, buf[2048] = "";
int x, buflen = 0;
int x, buflen = 0, xlen;
AST_DECLARE_APP_ARGS(args,
AST_APP_ARG(eventname);
AST_APP_ARG(extra)[100];
@@ -77,8 +77,13 @@ static int userevent_exec(struct ast_channel *chan, void *data)
AST_STANDARD_APP_ARGS(args, parse);
for (x = 0; x < args.argc - 1; x++) {
ast_copy_string(buf + buflen, args.extra[x], sizeof(buf) - buflen - 2);
buflen += strlen(args.extra[x]);
/* Stop once a header comes up that exceeds our buffer. */
if (sizeof(buf) <= buflen + (xlen = strlen(args.extra[x])) + 3) {
ast_log(LOG_WARNING, "UserEvent exceeds our buffer length! Truncating.\n");
break;
}
ast_copy_string(buf + buflen, args.extra[x], sizeof(buf) - buflen - 3);
buflen += xlen;
ast_copy_string(buf + buflen, "\r\n", 3);
buflen += 2;
}

8
main/manager.c
View File

@@ -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;
}