Eliminate a file descriptor leak when using the FILE() dialplan function.

(closes issue #18731)
Reported by: marioabajo

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

diff --git a/funcs/func_env.c b/funcs/func_env.c
index 736095290d9c386ee459a13ed9a1340d9005588b..aa0abb4b3307b1c7ba2a08e6dd3d93c59711e108 100644 (file)
--- a/funcs/func_env.c
+++ b/funcs/func_env.c
@@ -499,6 +499,7 @@ static int file_read(struct ast_channel *chan, const char *cmd, char *data, stru
 
                if (fseeko(ff, 0, SEEK_END) < 0) {
                        ast_log(LOG_ERROR, "Cannot seek to end of '%s': %s\n", args.filename, strerror(errno));
+                       fclose(ff);
                        return -1;
                }
                flength = ftello(ff);
@@ -511,6 +512,7 @@ static int file_read(struct ast_channel *chan, const char *cmd, char *data, stru
                        fseeko(ff, length, SEEK_END);
                        if ((length = ftello(ff)) - offset < 0) {
                                /* Eliminates all results */
+                               fclose(ff);
                                return -1;
                        }
                } else if (length == LLONG_MAX) {
@@ -537,6 +539,7 @@ static int file_read(struct ast_channel *chan, const char *cmd, char *data, stru
 
                        ast_str_append_substr(buf, len, fbuf, toappend);
                }
+               fclose(ff);
                return 0;
        }
 
@@ -701,6 +704,7 @@ static int file_read(struct ast_channel *chan, const char *cmd, char *data, stru
                }
        }
 
+       fclose(ff);
        return 0;
 }
 
@@ -772,6 +776,8 @@ static int file_write(struct ast_channel *chan, const char *cmd, char *data, con
                if (offset < 0) {
                        if (fseeko(ff, offset, SEEK_END)) {
                                ast_log(LOG_ERROR, "Cannot seek to offset: %s\n", strerror(errno));
+                               fclose(ff);
+                               return -1;
                        }
                        offset = ftello(ff);
                }