diff options
| -rw-r--r-- | main/manager.c | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/main/manager.c b/main/manager.c index a5b1b1938..d13672653 100644 --- a/main/manager.c +++ b/main/manager.c @@ -3983,17 +3983,18 @@ static struct ast_str *generic_http_callback(enum output_format format, if (s.f != NULL) { /* have temporary output */ char *buf; size_t 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) + if (MAP_FAILED == (buf = mmap(NULL, l + 1, PROT_READ | PROT_WRITE, MAP_PRIVATE, s.fd, 0))) { + ast_log(LOG_WARNING, "mmap failed. Manager output was not processed\n"); + } else { + buf[l] = '\0'; + if (format == FORMAT_XML || format == FORMAT_HTML) { xml_translate(&out, buf, params, format); - else + } else { ast_str_append(&out, 0, "%s", buf); - munmap(buf, l); + } + munmap(buf, l + 1); } } else if (format == FORMAT_XML || format == FORMAT_HTML) { xml_translate(&out, "", params, format); |