diff options
| author | kpfleming <kpfleming@f38db490-d61c-443f-a65b-d21fe96a405b> | 2006-11-15 20:51:18 +0000 |
|---|---|---|
| committer | kpfleming <kpfleming@f38db490-d61c-443f-a65b-d21fe96a405b> | 2006-11-15 20:51:18 +0000 |
| commit | b1986af15965263da83601b70831375c58c5bd08 (patch) | |
| tree | 0546ff5bddf43a28d8266bb014a799196563b728 /main/file.c | |
| parent | d6510bdceeadcdf5da649a0352ae48e83da1cb54 (diff) | |
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: http://svn.digium.com/svn/asterisk/trunk@47702 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'main/file.c')
| -rw-r--r-- | main/file.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/main/file.c b/main/file.c index 8037bef74..c6262bf89 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 */ |