diff options
| author | tilghman <tilghman@f38db490-d61c-443f-a65b-d21fe96a405b> | 2010-07-20 16:37:18 +0000 |
|---|---|---|
| committer | tilghman <tilghman@f38db490-d61c-443f-a65b-d21fe96a405b> | 2010-07-20 16:37:18 +0000 |
| commit | 67f990dc2fac8834c0a5fef5276ed39327d7db48 (patch) | |
| tree | 58e8d17301f34e05753162ec5a6f89e2e6933d24 /main | |
| parent | c448d53effd29109b2dcfd0b5ba3b47e22469deb (diff) | |
Off-by-one error
(closes issue #16506)
Reported by: nik600
Patches:
20100629__issue16506.diff.txt uploaded by tilghman (license 14)
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.4@278023 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'main')
| -rw-r--r-- | main/manager.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/main/manager.c b/main/manager.c index 80841789c..42bac53cd 100644 --- a/main/manager.c +++ b/main/manager.c @@ -2917,14 +2917,12 @@ static char *generic_http_callback(int format, struct sockaddr_in *requestor, co char *buf; 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))) { + if (MAP_FAILED == (buf = mmap(NULL, l + 1, PROT_READ | PROT_WRITE, MAP_SHARED, ss.fd, 0))) { ast_log(LOG_WARNING, "mmap failed. Manager request output was not processed\n"); } else { char *tmpbuf; + buf[l] = '\0'; if (format == FORMAT_XML) tmpbuf = xml_translate(buf, params); else if (format == FORMAT_HTML) @@ -2945,7 +2943,7 @@ static char *generic_http_callback(int format, struct sockaddr_in *requestor, co free(tmpbuf); free(s->outputstr); s->outputstr = NULL; - munmap(buf, l); + munmap(buf, l + 1); } } fclose(ss.f); |