diff options
| author | tilghman <tilghman@f38db490-d61c-443f-a65b-d21fe96a405b> | 2007-03-27 23:32:46 +0000 |
|---|---|---|
| committer | tilghman <tilghman@f38db490-d61c-443f-a65b-d21fe96a405b> | 2007-03-27 23:32:46 +0000 |
| commit | 1cb7963e2eb6b350908f57a37b9d4048b65b9d13 (patch) | |
| tree | 41e2dc470b77c0a9833d2f417755be068f34e2b0 | |
| parent | 274f0d20d5c0dda07d1ccc04fe32df5147a28414 (diff) | |
Merged revisions 59280 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.2
........
r59280 | tilghman | 2007-03-27 18:31:20 -0500 (Tue, 27 Mar 2007) | 2 lines
Fix a few remaining bad mmap(2) return values
........
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.4@59281 f38db490-d61c-443f-a65b-d21fe96a405b
| -rw-r--r-- | apps/app_voicemail.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/apps/app_voicemail.c b/apps/app_voicemail.c index 184ef125f..b5bd8987f 100644 --- a/apps/app_voicemail.c +++ b/apps/app_voicemail.c @@ -949,7 +949,7 @@ static int retrieve_file(char *dir, int msgnum) int res; int fd=-1; size_t fdlen = 0; - void *fdm=NULL; + void *fdm = MAP_FAILED; SQLSMALLINT colcount=0; SQLHSTMT stmt; char sql[PATH_MAX]; @@ -1066,7 +1066,7 @@ static int retrieve_file(char *dir, int msgnum) } /* Read out in small chunks */ for (offset = 0; offset < colsize2; offset += CHUNKSIZE) { - if ((fdm = mmap(NULL, CHUNKSIZE, PROT_READ | PROT_WRITE, MAP_SHARED, fd, offset)) == (void *)-1) { + if ((fdm = mmap(NULL, CHUNKSIZE, PROT_READ | PROT_WRITE, MAP_SHARED, fd, offset)) == MAP_FAILED) { ast_log(LOG_WARNING, "Could not mmap the output file: %s (%d)\n", strerror(errno), errno); SQLFreeHandle(SQL_HANDLE_STMT, stmt); ast_odbc_release_obj(obj); @@ -1344,7 +1344,7 @@ static int store_file(char *dir, char *mailboxuser, char *mailboxcontext, int ms int x = 0; int res; int fd = -1; - void *fdm=NULL; + void *fdm = MAP_FAILED; size_t fdlen = -1; SQLHSTMT stmt; SQLINTEGER len; @@ -1400,7 +1400,7 @@ static int store_file(char *dir, char *mailboxuser, char *mailboxcontext, int ms lseek(fd, 0, SEEK_SET); printf("Length is %zd\n", fdlen); fdm = mmap(NULL, fdlen, PROT_READ | PROT_WRITE, MAP_SHARED,fd, 0); - if (!fdm) { + if (fdm != MAP_FAILED) { ast_log(LOG_WARNING, "Memory map failed!\n"); ast_odbc_release_obj(obj); goto yuck; @@ -1449,7 +1449,7 @@ static int store_file(char *dir, char *mailboxuser, char *mailboxcontext, int ms yuck: if (cfg) ast_config_destroy(cfg); - if (fdm) + if (fdm != MAP_FAILED) munmap(fdm, fdlen); if (fd > -1) close(fd); |