Merged revisions 27093 via svnmerge from
authorTilghman Lesher <tilghman@meg.abyt.es>
Sat, 13 May 2006 04:18:25 +0000 (04:18 +0000)
committerTilghman Lesher <tilghman@meg.abyt.es>
Sat, 13 May 2006 04:18:25 +0000 (04:18 +0000)
https://origsvn.digium.com/svn/asterisk/branches/1.2

........
r27093 | tilghman | 2006-05-12 23:08:29 -0500 (Fri, 12 May 2006) | 2 lines

Bug 7134 - File descriptor leak with ODBC storage of voicemail

........

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@27094 65c4cc65-6c06-0410-ace0-fbb531ad65f3

apps/app_voicemail.c

index e718853..66ccf42 100644 (file)
@@ -919,7 +919,7 @@ static int retrieve_file(char *dir, int msgnum)
                        odbc_release_obj(obj);
                        goto yuck;
                }
                        odbc_release_obj(obj);
                        goto yuck;
                }
-               fd = open(full_fn, O_RDWR | O_CREAT | O_TRUNC);
+               fd = open(full_fn, O_RDWR | O_CREAT | O_TRUNC, 0770);
                if (fd < 0) {
                        ast_log(LOG_WARNING, "Failed to write '%s': %s\n", full_fn, strerror(errno));
                        SQLFreeHandle (SQL_HANDLE_STMT, stmt);
                if (fd < 0) {
                        ast_log(LOG_WARNING, "Failed to write '%s': %s\n", full_fn, strerror(errno));
                        SQLFreeHandle (SQL_HANDLE_STMT, stmt);
@@ -949,13 +949,13 @@ static int retrieve_file(char *dir, int msgnum)
                        if (!strcasecmp(coltitle, "recording")) {
                                res = SQLGetData(stmt, x + 1, SQL_BINARY, NULL, 0, &colsize);
                                fdlen = colsize;
                        if (!strcasecmp(coltitle, "recording")) {
                                res = SQLGetData(stmt, x + 1, SQL_BINARY, NULL, 0, &colsize);
                                fdlen = colsize;
-                               fd = open(full_fn, O_RDWR | O_TRUNC | O_CREAT, 0770);
                                if (fd > -1) {
                                        char tmp[1]="";
                                        lseek(fd, fdlen - 1, SEEK_SET);
                                        if (write(fd, tmp, 1) != 1) {
                                                close(fd);
                                                fd = -1;
                                if (fd > -1) {
                                        char tmp[1]="";
                                        lseek(fd, fdlen - 1, SEEK_SET);
                                        if (write(fd, tmp, 1) != 1) {
                                                close(fd);
                                                fd = -1;
+                                               continue;
                                        }
                                        if (fd > -1)
                                                fdm = mmap(NULL, fdlen, PROT_READ | PROT_WRITE, MAP_SHARED, fd, 0);
                                        }
                                        if (fd > -1)
                                                fdm = mmap(NULL, fdlen, PROT_READ | PROT_WRITE, MAP_SHARED, fd, 0);