]> git.ipfire.org Git - thirdparty/asterisk.git/commitdiff
Merged revisions 167555 via svnmerge from
authorRussell Bryant <russell@russellbryant.com>
Wed, 7 Jan 2009 22:27:47 +0000 (22:27 +0000)
committerRussell Bryant <russell@russellbryant.com>
Wed, 7 Jan 2009 22:27:47 +0000 (22:27 +0000)
https://origsvn.digium.com/svn/asterisk/trunk

................
r167555 | russell | 2009-01-07 16:27:23 -0600 (Wed, 07 Jan 2009) | 10 lines

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

........
r167554 | russell | 2009-01-07 16:26:42 -0600 (Wed, 07 Jan 2009) | 2 lines

Don't fclose() the file early, the filestream destructor will handle it.

........

................

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

main/file.c

index 53a8b5dca290dfe615c1845a61ad6c56d5fb7756..aeb387371ddc5509d08dc0039c6bdc5d80dead03 100644 (file)
@@ -447,7 +447,6 @@ static int ast_filehelper(const char *filename, const void *arg2, const char *fm
                                        continue;
                                }
                                if (open_wrapper(s)) {
-                                       fclose(bfile);
                                        ast_free(fn);
                                        ast_closestream(s);
                                        continue;       /* cannot run open on file */