diff options
author | tilghman <tilghman@f38db490-d61c-443f-a65b-d21fe96a405b> | 2009-10-27 20:16:49 +0000 |
---|---|---|
committer | tilghman <tilghman@f38db490-d61c-443f-a65b-d21fe96a405b> | 2009-10-27 20:16:49 +0000 |
commit | ea0f299abf8f0b86b9573dd4a6221b04efc46865 (patch) | |
tree | 187706d3d8d4e2dca5dc7cb82c37616a3982b874 /main/manager.c | |
parent | 8b0bc91966e7c3cc542933f6a40b2323fd1b0cc0 (diff) |
Manager output is not always NULL-terminated, so force a NULL at the end of the filestream.
(closes issue #15495)
Reported by: pdf
Patches:
20090916__issue15495.diff.txt uploaded by tilghman (license 14)
Tested by: pdf
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.4@226138 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'main/manager.c')
-rw-r--r-- | main/manager.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/main/manager.c b/main/manager.c index 73a66f0bd..67e4a4f74 100644 --- a/main/manager.c +++ b/main/manager.c @@ -2882,8 +2882,12 @@ static char *generic_http_callback(int format, struct sockaddr_in *requestor, co ast_mutex_lock(&s->__lock); if (ss.fd > -1) { char *buf; - size_t l = lseek(ss.fd, 0, SEEK_END); - if (l) { + size_t l; + + /* Ensure buffer is NULL-terminated */ + fprintf(ss.f, "%c", 0); + + if ((l = lseek(ss.fd, 0, SEEK_END)) > 0) { if (MAP_FAILED == (buf = mmap(NULL, l, PROT_READ | PROT_WRITE, MAP_PRIVATE, ss.fd, 0))) { ast_log(LOG_WARNING, "mmap failed. Manager request output was not processed\n"); } else { |