diff options
| author | tilghman <tilghman@f38db490-d61c-443f-a65b-d21fe96a405b> | 2009-10-27 20:24:08 +0000 |
|---|---|---|
| committer | tilghman <tilghman@f38db490-d61c-443f-a65b-d21fe96a405b> | 2009-10-27 20:24:08 +0000 |
| commit | 8605752566a7c9a0649bed10849986a7aafbc7e5 (patch) | |
| tree | f51c6f3ecb27ec7c74ce474c0cfd5b9f71e0cf21 /main/manager.c | |
| parent | 726cb9c1c3491c40ac2858fe97ed5ac9dceb2ead (diff) | |
Merged revisions 226159 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk
................
r226159 | tilghman | 2009-10-27 15:22:07 -0500 (Tue, 27 Oct 2009) | 14 lines
Merged revisions 226138 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r226138 | tilghman | 2009-10-27 15:16:49 -0500 (Tue, 27 Oct 2009) | 7 lines
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.6.2@226170 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'main/manager.c')
| -rw-r--r-- | main/manager.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/main/manager.c b/main/manager.c index 008506072..c9c3263d3 100644 --- a/main/manager.c +++ b/main/manager.c @@ -3918,9 +3918,12 @@ static struct ast_str *generic_http_callback(enum output_format format, if (s.f != NULL) { /* have temporary output */ char *buf; - size_t l = ftell(s.f); + size_t l; - if (l) { + /* Ensure buffer is NULL-terminated */ + fprintf(s.f, "%c", 0); + + if ((l = ftell(s.f))) { if ((buf = mmap(NULL, l, PROT_READ | PROT_WRITE, MAP_SHARED, s.fd, 0))) { if (format == FORMAT_XML || format == FORMAT_HTML) xml_translate(&out, buf, params, format); |