diff options
| author | russell <russell@f38db490-d61c-443f-a65b-d21fe96a405b> | 2007-03-27 23:19:41 +0000 |
|---|---|---|
| committer | russell <russell@f38db490-d61c-443f-a65b-d21fe96a405b> | 2007-03-27 23:19:41 +0000 |
| commit | ff8c69828d0cce50a3a7e18867830cc15af50c00 (patch) | |
| tree | 29876d92f0b16831ab6fb8c44b3535f591136fea /apps | |
| parent | 95fcfdc94d26dd9bfff45161c51e707ab59a8c8e (diff) | |
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/branches/1.2@59277 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'apps')
| -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 9caefc030..2b1d4e967 100644 --- a/apps/app_directory.c +++ b/apps/app_directory.c @@ -94,7 +94,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]=""; @@ -161,7 +161,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)) { @@ -174,7 +174,7 @@ static void retrieve_file(char *dir) } while (0); } 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); |