From b765278efeacd8031ae3aa9bdba5316a1ae52e15 Mon Sep 17 00:00:00 2001 From: Tilghman Lesher Date: Tue, 20 Jul 2010 16:37:18 +0000 Subject: [PATCH] Off-by-one error (closes issue #16506) Reported by: nik600 Patches: 20100629__issue16506.diff.txt uploaded by tilghman (license 14) git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.4@278023 65c4cc65-6c06-0410-ace0-fbb531ad65f3 --- main/manager.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/main/manager.c b/main/manager.c index 80841789c3..42bac53cd6 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); -- 2.47.3