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: https://origsvn.digium.com/svn/asterisk/trunk@59279 65c4cc65-6c06-0410-ace0-fbb531ad65f3

diff --git a/apps/app_directory.c b/apps/app_directory.c
index cd8c614e79564d1d2865c53830063ef34e89363d..84310e0892c52fea857cbf6b3cd75dd05dce5b02 100644 (file)
--- 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);