Asterisk
/
asterisk
mirror of https://github.com/asterisk/asterisk
1
0
Fork 0
Code Issues Releases Wiki Activity

Fix the check of the return value from mmap(). Thanks to Corydon for catching

Browse Source 
this one.


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.2@59277 65c4cc65-6c06-0410-ace0-fbb531ad65f3
1.2
Russell Bryant 18 years ago
parent ec9fb9a970
commit 653b6f22c5
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File

6
apps/app_directory.c
Unescape View File

@ -94,7 +94,7 @@ static void retrieve_file(char *dir)
int res; int res;
int fd=-1; int fd=-1;
size_t fdlen = 0; size_t fdlen = 0;
void *fdm=NULL; void *fdm = MAP_FAILED;
SQLHSTMT stmt; SQLHSTMT stmt;
char sql[256]; char sql[256];
char fmt[80]=""; char fmt[80]="";
@ -161,7 +161,7 @@ static void retrieve_file(char *dir)
if (fd > -1) if (fd > -1)
fdm = mmap(NULL, fdlen, PROT_READ | PROT_WRITE, MAP_SHARED, fd, 0); fdm = mmap(NULL, fdlen, PROT_READ | PROT_WRITE, MAP_SHARED, fd, 0);
} }
if (fdm) { if (fdm != MAP_FAILED) {
memset(fdm, 0, fdlen); memset(fdm, 0, fdlen);
res = SQLGetData(stmt, x + 1, SQL_BINARY, fdm, fdlen, &colsize); res = SQLGetData(stmt, x + 1, SQL_BINARY, fdm, fdlen, &colsize);
if ((res != SQL_SUCCESS) && (res != SQL_SUCCESS_WITH_INFO)) { if ((res != SQL_SUCCESS) && (res != SQL_SUCCESS_WITH_INFO)) {
@ -174,7 +174,7 @@ static void retrieve_file(char *dir)
} while (0); } while (0);
} else } else
ast_log(LOG_WARNING, "Failed to obtain database object for '%s'!\n", odbc_database); ast_log(LOG_WARNING, "Failed to obtain database object for '%s'!\n", odbc_database);
if (fdm) if (fdm != MAP_FAILED)
munmap(fdm, fdlen); munmap(fdm, fdlen);
if (fd > -1) if (fd > -1)
close(fd); close(fd);

Write Preview
Loading…
Cancel
Save