Merged revisions 47701 via svnmerge from
authorKevin P. Fleming <kpfleming@digium.com>
Wed, 15 Nov 2006 20:51:18 +0000 (20:51 +0000)
committerKevin P. Fleming <kpfleming@digium.com>
Wed, 15 Nov 2006 20:51:18 +0000 (20:51 +0000)
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

main/file.c

index 8037bef..c6262bf 100644 (file)
@@ -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 */