From 071301029cdd5158e12f52dcf6245a14394e5ece Mon Sep 17 00:00:00 2001 From: Tilghman Lesher Date: Mon, 19 Jan 2009 20:05:52 +0000 Subject: Merged revisions 169364 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r169364 | tilghman | 2009-01-19 13:49:25 -0600 (Mon, 19 Jan 2009) | 4 lines Truncate userevents at the end of a line, when the command exceeds the buffer. (closes issue #14278) Reported by: fnordian ........ git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@169365 65c4cc65-6c06-0410-ace0-fbb531ad65f3 --- apps/app_userevent.c | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-) (limited to 'apps/app_userevent.c') diff --git a/apps/app_userevent.c b/apps/app_userevent.c index 264a40ceb..f716ccba6 100644 --- a/apps/app_userevent.c +++ b/apps/app_userevent.c @@ -58,15 +58,22 @@ static char *app = "UserEvent"; static int userevent_exec(struct ast_channel *chan, void *data) { - char *parse, buf[2048] = ""; - int x, buflen = 0; + char *parse; + int x; AST_DECLARE_APP_ARGS(args, AST_APP_ARG(eventname); AST_APP_ARG(extra)[100]; ); + struct ast_str *body = ast_str_create(16); if (ast_strlen_zero(data)) { ast_log(LOG_WARNING, "UserEvent requires an argument (eventname,optional event body)\n"); + ast_free(body); + return -1; + } + + if (!body) { + ast_log(LOG_WARNING, "Unable to allocate buffer\n"); return -1; } @@ -75,13 +82,11 @@ 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]); - ast_copy_string(buf + buflen, "\r\n", 3); - buflen += 2; + ast_str_append(&body, 0, "%s\r\n", args.extra[x]); } - manager_event(EVENT_FLAG_USER, "UserEvent", "UserEvent: %s\r\n%s", args.eventname, buf); + manager_event(EVENT_FLAG_USER, "UserEvent", "UserEvent: %s\r\n%s", args.eventname, ast_str_buffer(body)); + ast_free(body); return 0; } -- cgit v1.2.3