[svn-commits] dbailey: trunk r189419 - in /trunk: ./ channels/ main/ main/db1-ast/recno/
SVN commits to the Digium repositories
svn-commits at lists.digium.com
Mon Apr 20 14:28:22 CDT 2009
Author: dbailey
Date: Mon Apr 20 14:28:16 2009
New Revision: 189419
URL: http://svn.digium.com/svn-view/asterisk?view=rev&rev=189419
Log:
Merged revisions 189391 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r189391 | dbailey | 2009-04-20 14:10:56 -0500 (Mon, 20 Apr 2009) | 4 lines
Clean up problem with manager implementation of mmap where it was not testing against MAP_FAILED response.
Got rid of shadowed variable used in processign the mmap results.
Change test of mmap results to compare against MAP_FAILED
........
Modified:
trunk/ (props changed)
trunk/channels/chan_iax2.c
trunk/main/db1-ast/recno/rec_open.c
trunk/main/manager.c
Propchange: trunk/
------------------------------------------------------------------------------
Binary property 'branch-1.4-merged' - no diff available.
Modified: trunk/channels/chan_iax2.c
URL: http://svn.digium.com/svn-view/asterisk/trunk/channels/chan_iax2.c?view=diff&rev=189419&r1=189418&r2=189419
==============================================================================
--- trunk/channels/chan_iax2.c (original)
+++ trunk/channels/chan_iax2.c Mon Apr 20 14:28:16 2009
@@ -2200,7 +2200,7 @@
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;
Modified: trunk/main/db1-ast/recno/rec_open.c
URL: http://svn.digium.com/svn-view/asterisk/trunk/main/db1-ast/recno/rec_open.c?view=diff&rev=189419&r1=189418&r2=189419
==============================================================================
--- trunk/main/db1-ast/recno/rec_open.c (original)
+++ trunk/main/db1-ast/recno/rec_open.c Mon Apr 20 14:28:16 2009
@@ -169,7 +169,7 @@
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;
Modified: trunk/main/manager.c
URL: http://svn.digium.com/svn-view/asterisk/trunk/main/manager.c?view=diff&rev=189419&r1=189418&r2=189419
==============================================================================
--- trunk/main/manager.c (original)
+++ trunk/main/manager.c Mon Apr 20 14:28:16 2009
@@ -3921,7 +3921,9 @@
size_t l = ftell(s.f);
if (l) {
- if ((buf = mmap(NULL, l, PROT_READ | PROT_WRITE, MAP_SHARED, s.fd, 0))) {
+ if (MAP_FAILED == (buf = mmap(NULL, l, PROT_READ | PROT_WRITE, MAP_PRIVATE, s.fd, 0))) {
+ ast_log(LOG_WARNING, "mmap failed. Manager output was not processed\n");
+ } else {
if (format == FORMAT_XML || format == FORMAT_HTML)
xml_translate(&out, buf, params, format);
else
More information about the svn-commits
mailing list