diff options
author | Tilghman Lesher <tilghman@meg.abyt.es> | 2007-06-29 04:56:08 +0000 |
---|---|---|
committer | Tilghman Lesher <tilghman@meg.abyt.es> | 2007-06-29 04:56:08 +0000 |
commit | abe50d3e4b30d8390a62d41752be700b04f3778f (patch) | |
tree | cfd1679a5b9d950d58413343d92023ef176406c3 /main | |
parent | 19153e86a95d48468f0443515f750ded93079bcc (diff) |
Merged revisions 72556 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r72556 | tilghman | 2007-06-28 23:47:11 -0500 (Thu, 28 Jun 2007) | 2 lines
Issue 10055 - Change memory allocation to use the heap for a command, since the output has the potential to overflow the stack (as it did here)
........
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@72557 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'main')
-rw-r--r-- | main/manager.c | 25 |
1 files changed, 17 insertions, 8 deletions
diff --git a/main/manager.c b/main/manager.c index c5646be5b..2c66f5fb4 100644 --- a/main/manager.c +++ b/main/manager.c @@ -1847,17 +1847,26 @@ static int action_command(struct mansession *s, const struct message *m) /* FIXME: Wedge a ActionID response in here, waiting for later changes */ ast_cli_command(fd, cmd); /* XXX need to change this to use a FILE * */ l = lseek(fd, 0, SEEK_END); /* how many chars available */ - buf = alloca(l + 1); - final_buf = alloca(l + 1); - lseek(fd, 0, SEEK_SET); - read(fd, buf, l); - buf[l] = '\0'; + + /* This has a potential to overflow the stack. Hence, use the heap. */ + buf = ast_calloc(1, l + 1); + final_buf = ast_calloc(1, l + 1); + if (buf) { + lseek(fd, 0, SEEK_SET); + read(fd, buf, l); + buf[l] = '\0'; + if (final_buf) { + term_strip(final_buf, buf, l); + final_buf[l] = '\0'; + } + astman_append(s, S_OR(final_buf, buf)); + ast_free(buf); + } close(fd); unlink(template); - term_strip(final_buf, buf, l); - final_buf[l] = '\0'; - astman_append(s, final_buf); astman_append(s, "--END COMMAND--\r\n\r\n"); + if (final_buf) + ast_free(final_buf); return 0; } |