From: Kevin P. Fleming <kpfleming@digium.com>
Date: Wed, 15 Nov 2006 20:51:18 +0000 (+0000)
Subject: Merged revisions 47701 via svnmerge from
X-Git-Tag: 1.6.0-beta1~3^2~3954
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c4ad5399c24934248e5259c21f2afe4b5c565f13;p=thirdparty%2Fasterisk.git

Merged revisions 47701 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r47701 | kpfleming | 2006-11-15 14:50:06 -0600 (Wed, 15 Nov 2006) | 2 lines

don't try to call fclose() if fopen() failed

........


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

diff --git a/main/file.c b/main/file.c
index 8037bef741..c6262bf896 100644
--- a/main/file.c
+++ b/main/file.c
@@ -830,12 +830,13 @@ struct ast_filestream *ast_readfile(const char *filename, const char *type, cons
 		errno = 0;
 		bfile = fopen(fn, "r");
 		if (!bfile || (fs = get_filestream(f, bfile)) == NULL ||
-			open_wrapper(fs) ) {
+		    open_wrapper(fs) ) {
 			ast_log(LOG_WARNING, "Unable to open %s\n", fn);
-			fclose(bfile);
-			free(fn);
 			if (fs)
 				free(fs);
+			if (bfile)
+				fclose(bfile);
+			free(fn);
 			continue;
 		}
 		/* found it */