[svn-commits] tilghman: trunk r305845 - in /trunk: ./ funcs/func_env.c

[SVN commits to the Digium repositories]

Author: tilghman
Date: Wed Feb  2 14:06:33 2011
New Revision: 305845

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=305845
Log:
Merged revisions 305844 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.8

........
  r305844 | tilghman | 2011-02-02 14:05:43 -0600 (Wed, 02 Feb 2011) | 5 lines
  
  Eliminate a file descriptor leak when using the FILE() dialplan function.
  
  (closes issue #18731)
  Reported by: marioabajo
........

Modified:
    trunk/   (props changed)
    trunk/funcs/func_env.c

Propchange: trunk/
------------------------------------------------------------------------------
Binary property 'branch-1.8-merged' - no diff available.

Modified: trunk/funcs/func_env.c
URL: http://svnview.digium.com/svn/asterisk/trunk/funcs/func_env.c?view=diff&rev=305845&r1=305844&r2=305845
==============================================================================
--- trunk/funcs/func_env.c (original)
+++ trunk/funcs/func_env.c Wed Feb  2 14:06:33 2011
@@ -499,6 +499,7 @@
 
 		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 @@
 			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 @@
 
 			ast_str_append_substr(buf, len, fbuf, toappend);
 		}
+		fclose(ff);
 		return 0;
 	}
 
@@ -701,6 +704,7 @@
 		}
 	}
 
+	fclose(ff);
 	return 0;
 }
 
@@ -772,6 +776,8 @@
 		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);
 		}