From 6ffbaa32f35b291de1c3b2cb09614bd91b88584d Mon Sep 17 00:00:00 2001 From: Tilghman Lesher Date: Fri, 29 Jun 2007 04:47:11 +0000 Subject: [PATCH] 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/branches/1.4@72556 65c4cc65-6c06-0410-ace0-fbb531ad65f3 --- main/manager.c | 25 +++++++++++++++++-------- 1 file changed, 17 insertions(+), 8 deletions(-) diff --git a/main/manager.c b/main/manager.c index be77dfc941..0b20fafba3 100644 --- a/main/manager.c +++ b/main/manager.c @@ -1636,17 +1636,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; }