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

(closes issue #18731)
Reported by: marioabajo


git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.8@305844 f38db490-d61c-443f-a65b-d21fe96a405b

1 files changed, 6 insertions, 0 deletions

diff --git a/funcs/func_env.c b/funcs/func_env.c
index 736095290..aa0abb4b3 100644
--- 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);
 		}