diff options
| author | russell <russell@f38db490-d61c-443f-a65b-d21fe96a405b> | 2007-03-27 23:22:03 +0000 |
|---|---|---|
| committer | russell <russell@f38db490-d61c-443f-a65b-d21fe96a405b> | 2007-03-27 23:22:03 +0000 |
| commit | d53c8b5ad3c79b27c517ffd3c98e0ce25723932c (patch) | |
| tree | 1a960f0dbb82b306e199979bcfd3f22d3deb0890 /apps/app_directory.c | |
| parent | 6e07fdda2a589eafd34363ace2aeb13058e0154c (diff) | |
Merged revisions 59278 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
................
r59278 | russell | 2007-03-27 18:20:22 -0500 (Tue, 27 Mar 2007) | 11 lines
Merged revisions 59277 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.2
........
r59277 | russell | 2007-03-27 18:19:41 -0500 (Tue, 27 Mar 2007) | 3 lines
Fix the check of the return value from mmap(). Thanks to Corydon for catching
this one.
........
................
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@59279 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'apps/app_directory.c')
| -rw-r--r-- | apps/app_directory.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/apps/app_directory.c b/apps/app_directory.c index cd8c614e7..84310e089 100644 --- a/apps/app_directory.c +++ b/apps/app_directory.c @@ -95,7 +95,7 @@ static void retrieve_file(char *dir) int res; int fd=-1; size_t fdlen = 0; - void *fdm=NULL; + void *fdm = MAP_FAILED; SQLHSTMT stmt; char sql[256]; char fmt[80]=""; @@ -162,7 +162,7 @@ static void retrieve_file(char *dir) if (fd > -1) fdm = mmap(NULL, fdlen, PROT_READ | PROT_WRITE, MAP_SHARED, fd, 0); } - if (fdm) { + if (fdm != MAP_FAILED) { memset(fdm, 0, fdlen); res = SQLGetData(stmt, x + 1, SQL_BINARY, fdm, fdlen, &colsize); if ((res != SQL_SUCCESS) && (res != SQL_SUCCESS_WITH_INFO)) { @@ -176,7 +176,7 @@ static void retrieve_file(char *dir) ast_odbc_release_obj(obj); } else ast_log(LOG_WARNING, "Failed to obtain database object for '%s'!\n", odbc_database); - if (fdm) + if (fdm != MAP_FAILED) munmap(fdm, fdlen); if (fd > -1) close(fd); |