diff options
author | tilghman <tilghman@f38db490-d61c-443f-a65b-d21fe96a405b> | 2009-01-19 20:10:13 +0000 |
---|---|---|
committer | tilghman <tilghman@f38db490-d61c-443f-a65b-d21fe96a405b> | 2009-01-19 20:10:13 +0000 |
commit | a2f4c5acdee39ea7d22f5fe5f919d512aa8ab51f (patch) | |
tree | 273fbf81b5da0a3d28ce3b2ea8295362b27bf267 /main/manager.c | |
parent | 8059ff2f4f18adc99747ec2959d7c64eda22de9b (diff) |
Merged revisions 169365 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk
................
r169365 | tilghman | 2009-01-19 14:05:52 -0600 (Mon, 19 Jan 2009) | 11 lines
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: http://svn.digium.com/svn/asterisk/branches/1.6.1@169368 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'main/manager.c')
-rw-r--r-- | main/manager.c | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/main/manager.c b/main/manager.c index 057aa1d34..3906f8a05 100644 --- a/main/manager.c +++ b/main/manager.c @@ -910,6 +910,8 @@ static int send_string(struct mansession *s, char *string) * initialize the thread local storage key. */ AST_THREADSTORAGE(astman_append_buf); +AST_THREADSTORAGE(userevent_buf); + /*! \brief initial allocated size for the astman_append_buf */ #define ASTMAN_APPEND_BUF_INITSIZE 256 @@ -2592,18 +2594,15 @@ static char mandescr_userevent[] = 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; + struct ast_str *body = ast_str_thread_get(&userevent_buf, 16); + int x; for (x = 0; x < m->hdrcount; x++) { if (strncasecmp("UserEvent:", m->headers[x], strlen("UserEvent:"))) { - ast_copy_string(body + bodylen, m->headers[x], sizeof(body) - bodylen - 3); - bodylen += strlen(m->headers[x]); - ast_copy_string(body + bodylen, "\r\n", 3); - bodylen += 2; + ast_str_append(&body, 0, "%s\r\n", m->headers[x]); } } - manager_event(EVENT_FLAG_USER, "UserEvent", "UserEvent: %s\r\n%s", event, body); + manager_event(EVENT_FLAG_USER, "UserEvent", "UserEvent: %s\r\n%s", event, body->str); return 0; } |