kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2026-06-30 20:19:42 -07:00
Code Issues Packages Projects Releases Wiki Activity

Clean up problem with manager implementation of mmap where it was not testing against MAP_FAILED response.

Browse Source 
Got rid of shadowed variable used in processign the mmap results. 
Change test of mmap results to compare against MAP_FAILED


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.4@189391 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Doug Bailey
2009-04-20 19:10:56 +00:00
parent df7bee29a5
commit 100aa13ae2
3 changed files with 15 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
channels/chan_iax2.c
+1 -1
View File
@@ -1967,7 +1967,7 @@ static int try_firmware(char *s)
return -1;
}
fwh = (struct ast_iax2_firmware_header*)mmap(NULL, stbuf.st_size, PROT_READ, MAP_PRIVATE, fd, 0);
if (fwh == (void *) -1) {
if (fwh == MAP_FAILED) {
ast_log(LOG_WARNING, "mmap failed: %s\n", strerror(errno));
close(fd);
return -1;
main/db1-ast/recno/rec_open.c
+1 -1
View File
@@ -169,7 +169,7 @@ slow: if ((t->bt_rfp = fdopen(rfd, "r")) == NULL)
t->bt_msize = sb.st_size;
if ((t->bt_smap = mmap(NULL, t->bt_msize,
PROT_READ, MAP_PRIVATE, rfd,
(off_t)0)) == (caddr_t)-1)
(off_t)0)) == MAP_FAILED
goto slow;
t->bt_cmap = t->bt_smap;
t->bt_emap = t->bt_smap + sb.st_size;
main/manager.c
+13 -11
View File
@@ -2881,30 +2881,32 @@ static char *generic_http_callback(int format, struct sockaddr_in *requestor, co
char *buf;
size_t l = lseek(ss.fd, 0, SEEK_END);
if (l) {
if ((buf = mmap(NULL, l, PROT_READ | PROT_WRITE, MAP_SHARED, ss.fd, 0))) {
char *tmp;
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 {
char *tmpbuf;
if (format == FORMAT_XML)
tmp = xml_translate(buf, params);
tmpbuf = xml_translate(buf, params);
else if (format == FORMAT_HTML)
tmp = html_translate(buf);
tmpbuf = html_translate(buf);
else
tmp = buf;
if (tmp) {
tmpbuf = buf;
if (tmpbuf) {
size_t wlen, tlen;
if ((retval = malloc((wlen = strlen(workspace)) + (tlen = strlen(tmp)) + 128))) {
if ((retval = malloc((wlen = strlen(workspace)) + (tlen = strlen(tmpbuf)) + 128))) {
strcpy(retval, workspace);
strcpy(retval + wlen, tmp);
strcpy(retval + wlen, tmpbuf);
c = retval + wlen + tlen;
/* Leftover space for footer, if any */
len = 120;
}
}
if (tmp != buf)
free(tmp);
if (tmpbuf != buf)
free(tmpbuf);
free(s->outputstr);
s->outputstr = NULL;
munmap(buf, l);
}
munmap(buf, l);
}
fclose(ss.f);
ss.f = NULL;